Skip to content

Commit bcd8990

Browse files
KoditkarVedantKoditkarVedant
committed
Clean up integration tests
1 parent b7b4aba commit bcd8990

File tree

5 files changed

+143
-92
lines changed

5 files changed

+143
-92
lines changed

‎Test/Notion.IntegrationTests/CommentsClientTests.cs‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,22 @@
77

88
namespace Notion.IntegrationTests;
99

10-
public class CommentsClientTests : IDisposable
10+
public class CommentsClientTests : IntegrationTestBase, IDisposable
1111
{
12-
private readonly INotionClient _client;
1312
private readonly Page _page;
1413

1514
public CommentsClientTests()
1615
{
17-
var options = new ClientOptions { AuthToken = Environment.GetEnvironmentVariable("NOTION_AUTH_TOKEN") };
18-
19-
_client = NotionClientFactory.Create(options);
20-
21-
var pageParentId = Environment.GetEnvironmentVariable("NOTION_PAGE_PARENT_ID") ??
22-
throw new InvalidOperationException("Page parent id is required.");
23-
24-
_page = _client.Pages.CreateAsync(
16+
_page = Client.Pages.CreateAsync(
2517
PagesCreateParametersBuilder.Create(
26-
new ParentPageInput { PageId = pageParentId }
18+
new ParentPageInput { PageId = ParentPageId }
2719
).Build()
2820
).Result;
2921
}
3022

3123
public void Dispose()
3224
{
33-
_client.Pages.UpdateAsync(_page.Id, new PagesUpdateParameters { Archived = true }).Wait();
25+
Client.Pages.UpdateAsync(_page.Id, new PagesUpdateParameters { Archived = true }).Wait();
3426
}
3527

3628
[Fact]
@@ -43,7 +35,7 @@ public async Task ShouldCreatePageComment()
4335
);
4436

4537
// Act
46-
var response = await _client.Comments.CreateAsync(parameters);
38+
var response = await Client.Comments.CreateAsync(parameters);
4739

4840
// Arrange
4941

@@ -64,7 +56,7 @@ public async Task ShouldCreatePageComment()
6456
public async Task ShouldCreateADiscussionComment()
6557
{
6658
// Arrange
67-
var comment = await _client.Comments.CreateAsync(
59+
var comment = await Client.Comments.CreateAsync(
6860
CreateCommentParameters.CreatePageComment(
6961
new ParentPageInput { PageId = _page.Id },
7062
new List<RichTextBaseInput>
@@ -75,7 +67,7 @@ public async Task ShouldCreateADiscussionComment()
7567
);
7668

7769
// Act
78-
var response = await _client.Comments.CreateAsync(
70+
var response = await Client.Comments.CreateAsync(
7971
CreateCommentParameters.CreateDiscussionComment(
8072
comment.DiscussionId,
8173
new List<RichTextBaseInput>

‎Test/Notion.IntegrationTests/IBlocksClientTests.cs‎

Lines changed: 21 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,18 @@
88

99
namespace Notion.IntegrationTests;
1010

11-
public class IBlocksClientTests
11+
public class IBlocksClientTests : IntegrationTestBase
1212
{
13-
private readonly INotionClient _client;
14-
15-
public IBlocksClientTests()
16-
{
17-
var options = new ClientOptions { AuthToken = Environment.GetEnvironmentVariable("NOTION_AUTH_TOKEN") };
18-
19-
_client = NotionClientFactory.Create(options);
20-
}
21-
2213
[Fact]
2314
public async Task AppendChildrenAsync_AppendsBlocksGivenBlocks()
2415
{
25-
var pageParentId = "3c357473a28149a488c010d2b245a589";
26-
27-
var page = await _client.Pages.CreateAsync(
16+
var page = await Client.Pages.CreateAsync(
2817
PagesCreateParametersBuilder.Create(
29-
new ParentPageInput { PageId = pageParentId }
18+
new ParentPageInput { PageId = ParentPageId }
3019
).Build()
3120
);
3221

33-
var blocks = await _client.Blocks.AppendChildrenAsync(
22+
var blocks = await Client.Blocks.AppendChildrenAsync(
3423
page.Id,
3524
new BlocksAppendChildrenParameters
3625
{
@@ -56,21 +45,19 @@ public async Task AppendChildrenAsync_AppendsBlocksGivenBlocks()
5645
blocks.Results.Should().HaveCount(4);
5746

5847
// cleanup
59-
await _client.Pages.UpdateAsync(page.Id, new PagesUpdateParameters { Archived = true });
48+
await Client.Pages.UpdateAsync(page.Id, new PagesUpdateParameters { Archived = true });
6049
}
6150

6251
[Fact]
6352
public async Task UpdateBlockAsync_UpdatesGivenBlock()
6453
{
65-
var pageParentId = "3c357473a28149a488c010d2b245a589";
66-
67-
var page = await _client.Pages.CreateAsync(
54+
var page = await Client.Pages.CreateAsync(
6855
PagesCreateParametersBuilder.Create(
69-
new ParentPageInput { PageId = pageParentId }
56+
new ParentPageInput { PageId = ParentPageId }
7057
).Build()
7158
);
7259

73-
var blocks = await _client.Blocks.AppendChildrenAsync(
60+
var blocks = await Client.Blocks.AppendChildrenAsync(
7461
page.Id,
7562
new BlocksAppendChildrenParameters
7663
{
@@ -79,27 +66,25 @@ public async Task UpdateBlockAsync_UpdatesGivenBlock()
7966
);
8067

8168
var blockId = blocks.Results.First().Id;
82-
await _client.Blocks.UpdateAsync(blockId, new BreadcrumbUpdateBlock());
69+
await Client.Blocks.UpdateAsync(blockId, new BreadcrumbUpdateBlock());
8370

84-
blocks = await _client.Blocks.RetrieveChildrenAsync(page.Id);
71+
blocks = await Client.Blocks.RetrieveChildrenAsync(page.Id);
8572
blocks.Results.Should().HaveCount(1);
8673

8774
// cleanup
88-
await _client.Pages.UpdateAsync(page.Id, new PagesUpdateParameters { Archived = true });
75+
await Client.Pages.UpdateAsync(page.Id, new PagesUpdateParameters { Archived = true });
8976
}
9077

9178
[Fact]
9279
public async Task DeleteAsync_DeleteBlockWithGivenId()
9380
{
94-
var pageParentId = "3c357473a28149a488c010d2b245a589";
95-
96-
var page = await _client.Pages.CreateAsync(
81+
var page = await Client.Pages.CreateAsync(
9782
PagesCreateParametersBuilder.Create(
98-
new ParentPageInput { PageId = pageParentId }
83+
new ParentPageInput { PageId = ParentPageId }
9984
).Build()
10085
);
10186

102-
var blocks = await _client.Blocks.AppendChildrenAsync(
87+
var blocks = await Client.Blocks.AppendChildrenAsync(
10388
page.Id,
10489
new BlocksAppendChildrenParameters
10590
{
@@ -114,38 +99,36 @@ public async Task DeleteAsync_DeleteBlockWithGivenId()
11499
blocks.Results.Should().HaveCount(2);
115100

116101
// cleanup
117-
await _client.Pages.UpdateAsync(page.Id, new PagesUpdateParameters { Archived = true });
102+
await Client.Pages.UpdateAsync(page.Id, new PagesUpdateParameters { Archived = true });
118103
}
119104

120105
[Theory]
121106
[MemberData(nameof(BlockData))]
122107
public async Task UpdateAsync_UpdatesGivenBlock(IBlock block, IUpdateBlock updateBlock, Action<IBlock> assert)
123108
{
124-
var pageParentId = "3c357473a28149a488c010d2b245a589";
125-
126-
var page = await _client.Pages.CreateAsync(
109+
var page = await Client.Pages.CreateAsync(
127110
PagesCreateParametersBuilder.Create(
128-
new ParentPageInput { PageId = pageParentId }
111+
new ParentPageInput { PageId = ParentPageId }
129112
).Build()
130113
);
131114

132-
var blocks = await _client.Blocks.AppendChildrenAsync(
115+
var blocks = await Client.Blocks.AppendChildrenAsync(
133116
page.Id,
134117
new BlocksAppendChildrenParameters { Children = new List<IBlock> { block } }
135118
);
136119

137120
var blockId = blocks.Results.First().Id;
138-
await _client.Blocks.UpdateAsync(blockId, updateBlock);
121+
await Client.Blocks.UpdateAsync(blockId, updateBlock);
139122

140-
blocks = await _client.Blocks.RetrieveChildrenAsync(page.Id);
123+
blocks = await Client.Blocks.RetrieveChildrenAsync(page.Id);
141124
blocks.Results.Should().HaveCount(1);
142125

143126
var updatedBlock = blocks.Results.First();
144127

145128
assert.Invoke(updatedBlock);
146129

147130
// cleanup
148-
await _client.Pages.UpdateAsync(page.Id, new PagesUpdateParameters { Archived = true });
131+
await Client.Pages.UpdateAsync(page.Id, new PagesUpdateParameters { Archived = true });
149132
}
150133

151134
private static IEnumerable<object[]> BlockData()

0 commit comments

Comments
 (0)