Skip to content

Commit a2746e6

Browse files
RoblindeRoblinde
committed
Add new test project and tests
1 parent 0d2d32a commit a2746e6

File tree

9 files changed

+297
-5
lines changed

9 files changed

+297
-5
lines changed

‎Contentful.AspNetCore.Tests/Contentful.AspNetCore.Tests.csproj

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp1.1</TargetFramework>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
9+
<PackageReference Include="Moq" Version="4.7.63" />
10+
<PackageReference Include="xunit" Version="2.2.0" />
11+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<ProjectReference Include="..\Contentful.AspNetCore\Contentful.AspNetCore.csproj" />
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
20+
</ItemGroup>
21+
22+
</Project>

‎Contentful.AspNetCore.Tests/TagHelpers/ContentfulImageTagHelperTests.cs

+179
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,179 @@
1+
using Contentful.AspNetCore.TagHelpers;
2+
using Contentful.Core;
3+
using System;
4+
using System.Collections.Generic;
5+
using System.Text;
6+
using Xunit;
7+
using Moq;
8+
using System.Threading.Tasks;
9+
using Microsoft.AspNetCore.Razor.TagHelpers;
10+
11+
namespace Contentful.AspNetCore.Tests.TagHelpers
12+
{
13+
public class ContentfulImageTagHelperTests
14+
{
15+
[Fact]
16+
public async Task AltTextShouldBeSetIfMissingAndDescriptionIsPresent()
17+
{
18+
//Arrange
19+
var clientMock = new Mock<IContentfulClient>();
20+
var tagHelper = new ContentfulImageTagHelper(clientMock.Object);
21+
tagHelper.Asset = new Core.Models.Asset()
22+
{
23+
Description = "Banana",
24+
File = new Core.Models.File()
25+
{
26+
Url = "https://robertlinde.se"
27+
}
28+
};
29+
30+
var context = new TagHelperContext(new TagHelperAttributeList(), new Dictionary<object, object>(), "test");
31+
var output = new TagHelperOutput("img", new TagHelperAttributeList(), (b, c) => {
32+
var tagHelperContent = new DefaultTagHelperContent();
33+
tagHelperContent.SetContent(string.Empty);
34+
return Task.FromResult<TagHelperContent>(tagHelperContent);
35+
});
36+
37+
//Act
38+
await tagHelper.ProcessAsync(context, output);
39+
40+
//Assert
41+
Assert.Equal("https://robertlinde.se", tagHelper.Url);
42+
Assert.Equal("Banana", output.Attributes["alt"].Value);
43+
}
44+
45+
[Fact]
46+
public async Task AltTextShouldNotBeOverWrittenIfSet()
47+
{
48+
//Arrange
49+
var clientMock = new Mock<IContentfulClient>();
50+
var tagHelper = new ContentfulImageTagHelper(clientMock.Object);
51+
tagHelper.Asset = new Core.Models.Asset()
52+
{
53+
Description = "Banana",
54+
File = new Core.Models.File()
55+
{
56+
Url = "https://robertlinde.se"
57+
}
58+
};
59+
60+
var context = new TagHelperContext(new TagHelperAttributeList(), new Dictionary<object, object>(), "test");
61+
var output = new TagHelperOutput("img", new TagHelperAttributeList() { new TagHelperAttribute("alt", "alt text") }, (b, c) => {
62+
var tagHelperContent = new DefaultTagHelperContent();
63+
tagHelperContent.SetContent(string.Empty);
64+
return Task.FromResult<TagHelperContent>(tagHelperContent);
65+
});
66+
67+
//Act
68+
await tagHelper.ProcessAsync(context, output);
69+
70+
//Assert
71+
Assert.Equal("https://robertlinde.se", tagHelper.Url);
72+
Assert.Equal("alt text", output.Attributes["alt"].Value);
73+
}
74+
75+
[Fact]
76+
public async Task SrcSetShouldBePresentIfThereAreSources()
77+
{
78+
//Arrange
79+
var clientMock = new Mock<IContentfulClient>();
80+
var tagHelper = new ContentfulImageTagHelper(clientMock.Object);
81+
tagHelper.Asset = new Core.Models.Asset()
82+
{
83+
File = new Core.Models.File()
84+
{
85+
Url = "https://robertlinde.se"
86+
}
87+
};
88+
89+
var context = new TagHelperContext(new TagHelperAttributeList(), new Dictionary<object, object>(), "test");
90+
var output = new TagHelperOutput("img", new TagHelperAttributeList(), async (b, c) => {
91+
92+
var childSource = new ContentfulSource(clientMock.Object);
93+
childSource.Width = 500;
94+
await childSource.ProcessAsync(context, new TagHelperOutput("div", new TagHelperAttributeList(), (x,y) => { return null; }));
95+
var tagHelperContent = new DefaultTagHelperContent();
96+
tagHelperContent.SetContent(string.Empty);
97+
return tagHelperContent;
98+
});
99+
100+
//Act
101+
await tagHelper.ProcessAsync(context, output);
102+
103+
//Assert
104+
Assert.Equal("https://robertlinde.se", tagHelper.Url);
105+
Assert.Equal("https://robertlinde.se?w=500 500w", output.Attributes["srcset"].Value);
106+
}
107+
108+
[Fact]
109+
public async Task SourceShouldSetDefaultSizeIfNotSpecified()
110+
{
111+
//Arrange
112+
var clientMock = new Mock<IContentfulClient>();
113+
var tagHelper = new ContentfulSource(clientMock.Object);
114+
tagHelper.Asset = new Core.Models.Asset()
115+
{
116+
File = new Core.Models.File()
117+
{
118+
Url = "https://robertlinde.se"
119+
}
120+
};
121+
122+
tagHelper.Width = 500;
123+
124+
var context = new TagHelperContext(new TagHelperAttributeList(), new Dictionary<object, object>(), "test");
125+
126+
context.Items.Add("sources", new List<string>());
127+
context.Items.Add("defaults", null);
128+
129+
var output = new TagHelperOutput("div", new TagHelperAttributeList(), (b, c) => {
130+
var tagHelperContent = new DefaultTagHelperContent();
131+
tagHelperContent.SetContent(string.Empty);
132+
return Task.FromResult<TagHelperContent>(tagHelperContent);
133+
});
134+
135+
//Act
136+
await tagHelper.ProcessAsync(context, output);
137+
138+
//Assert
139+
Assert.Equal("https://robertlinde.se", tagHelper.Url);
140+
Assert.Equal("500w", tagHelper.Size);
141+
}
142+
143+
[Fact]
144+
public async Task SourceSizeShouldNotBeOverriddenWhenSet()
145+
{
146+
//Arrange
147+
var clientMock = new Mock<IContentfulClient>();
148+
var tagHelper = new ContentfulSource(clientMock.Object);
149+
tagHelper.Asset = new Core.Models.Asset()
150+
{
151+
File = new Core.Models.File()
152+
{
153+
Url = "https://robertlinde.se"
154+
}
155+
};
156+
157+
tagHelper.Width = 500;
158+
tagHelper.Size = "200w";
159+
160+
var context = new TagHelperContext(new TagHelperAttributeList(), new Dictionary<object, object>(), "test");
161+
162+
context.Items.Add("sources", new List<string>());
163+
context.Items.Add("defaults", null);
164+
165+
var output = new TagHelperOutput("div", new TagHelperAttributeList(), (b, c) => {
166+
var tagHelperContent = new DefaultTagHelperContent();
167+
tagHelperContent.SetContent(string.Empty);
168+
return Task.FromResult<TagHelperContent>(tagHelperContent);
169+
});
170+
171+
//Act
172+
await tagHelper.ProcessAsync(context, output);
173+
174+
//Assert
175+
Assert.Equal("https://robertlinde.se", tagHelper.Url);
176+
Assert.Equal("200w", tagHelper.Size);
177+
}
178+
}
179+
}

‎Contentful.AspNetCore/TagHelpers/ContentfulImageTagHelper.cs

+5
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,11 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
230230

231231
private void SetDefaults(ContentfulImageTagHelper defaults)
232232
{
233+
if(defaults == null)
234+
{
235+
return;
236+
}
237+
233238
ProgressiveJpg = defaults.ProgressiveJpg || ProgressiveJpg;
234239
ResizeBehaviour = ResizeBehaviour != ImageResizeBehaviour.Default ? ResizeBehaviour : defaults.ResizeBehaviour;
235240
FocusArea = FocusArea != ImageFocusArea.Default ? FocusArea : defaults.FocusArea;

‎Contentful.Core.Tests/ClientTestsBase.cs

+6
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@ public class TestCategory : IMarker
7878
public string Title { get; set; }
7979
}
8080

81+
public class TestWithTags
82+
{
83+
public SystemProperties Sys { get; set; }
84+
public List<string> Tags { get; set; }
85+
}
86+
8187
public class TestCompany : IMarker
8288
{
8389
public string CompanyDescription { get; set; }

‎Contentful.Core.Tests/Contentful.Core.Tests.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<None Remove="JsonFiles\SampleUser.json" />
88
</ItemGroup>
99
<ItemGroup>
10+
<EmbeddedResource Include="JsonFiles\EntriesCollectionWithoutSys.json" />
1011
<EmbeddedResource Include="JsonFiles\EntriesCollectionWithIncludesMissingEntries.json" />
1112
<EmbeddedResource Include="JsonFiles\EntryCollectionLoopedReferences.json" />
1213
<EmbeddedResource Include="JsonFiles\ApiKeysCollection.json" />

‎Contentful.Core.Tests/ContentfulClientTests.cs

+14
Original file line numberDiff line numberDiff line change
@@ -728,5 +728,19 @@ public async Task AllAssetsInACollectionShouldDeserializeCorrectly()
728728
c => { Assert.NotNull(c.Image); }
729729
);
730730
}
731+
732+
[Fact]
733+
public async Task GetEntriesWithSelectShouldYieldCorrectResult()
734+
{
735+
//Arrange
736+
_handler.Response = GetResponseFromFile(@"EntriesCollectionWithoutSys.json");
737+
var builder = QueryBuilder<TestWithTags>.New;
738+
//Act
739+
var res = await _client.GetEntriesByTypeAsync("666", builder);
740+
741+
//Assert
742+
Assert.Equal(4, res.Count());
743+
Assert.Equal("kitchen", res.First().Tags.First());
744+
}
731745
}
732746
}

‎Contentful.Core.Tests/JsonFiles/EntriesCollectionWithoutSys.json

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"sys": {
3+
"type": "Array"
4+
},
5+
"total": 4,
6+
"skip": 0,
7+
"limit": 100,
8+
"items": [
9+
{
10+
"fields": {
11+
"tags": [
12+
"kitchen",
13+
"accessories",
14+
"whisk",
15+
"scandinavia",
16+
"design"
17+
]
18+
}
19+
},
20+
{
21+
"fields": {
22+
"tags": [
23+
"wood",
24+
"toy",
25+
"car",
26+
"sweden",
27+
"design"
28+
]
29+
}
30+
},
31+
{
32+
"fields": {
33+
"tags": [
34+
"home décor",
35+
"clocks",
36+
"interior design",
37+
"yellow",
38+
"gifts"
39+
]
40+
}
41+
},
42+
{
43+
"fields": {
44+
"tags": [
45+
"vase",
46+
"flowers",
47+
"accessories"
48+
]
49+
}
50+
}
51+
]
52+
}

‎Contentful.Core/ContentfulClient.cs

+9-2
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public ContentfulClient(HttpClient httpClient, string deliveryApiKey, string spa
227227
var token = entryTokens[i];
228228
var grandParent = token.Parent.Parent;
229229

230-
if(grandParent["sys"]["type"]?.ToString() != "Entry")
230+
if(grandParent["sys"] != null && grandParent["sys"]["type"]?.ToString() != "Entry")
231231
{
232232
continue;
233233
}
@@ -264,7 +264,14 @@ public ContentfulClient(HttpClient httpClient, string deliveryApiKey, string spa
264264

265265
private void ResolveLinks(JObject json, JObject entryToken, ISet<string> processedIds, Type type)
266266
{
267-
var id = ((JValue) entryToken.SelectToken("$.sys.id")).Value.ToString();
267+
var id = ((JValue) entryToken.SelectToken("$.sys.id"))?.Value?.ToString();
268+
269+
if(id == null)
270+
{
271+
//No id token present, not possible to resolve links. Probably because the sys property has been excluded with a select statement.
272+
return;
273+
}
274+
268275
entryToken.AddFirst(new JProperty( "$id", new JValue(id)));
269276
processedIds.Add(id);
270277
var links = entryToken.SelectTokens("$.fields..sys").ToList();

‎Contentful.Net.sln

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26228.9
4+
VisualStudioVersion = 15.0.26430.14
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Contentful.Core", "Contentful.Core\Contentful.Core.csproj", "{3E644B4A-7C03-46B7-8877-279A37B8BA74}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contentful.Core.Tests", "Contentful.Core.Tests\Contentful.Core.Tests.csproj", "{94FF525B-0B1B-490E-A862-7B8B3FC065EF}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Contentful.Core.Tests", "Contentful.Core.Tests\Contentful.Core.Tests.csproj", "{94FF525B-0B1B-490E-A862-7B8B3FC065EF}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contentful.AspNetCore", "Contentful.AspNetCore\Contentful.AspNetCore.csproj", "{6D2387D9-B6A7-493E-9837-5CC39188D8B4}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Contentful.AspNetCore", "Contentful.AspNetCore\Contentful.AspNetCore.csproj", "{6D2387D9-B6A7-493E-9837-5CC39188D8B4}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contentful.AspNetCore.Tests", "Contentful.AspNetCore.Tests\Contentful.AspNetCore.Tests.csproj", "{43F0B566-83F1-4AD4-933F-FE8D4B80DBB9}"
1113
EndProject
1214
Global
1315
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -27,6 +29,10 @@ Global
2729
{6D2387D9-B6A7-493E-9837-5CC39188D8B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
2830
{6D2387D9-B6A7-493E-9837-5CC39188D8B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
2931
{6D2387D9-B6A7-493E-9837-5CC39188D8B4}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{43F0B566-83F1-4AD4-933F-FE8D4B80DBB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{43F0B566-83F1-4AD4-933F-FE8D4B80DBB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{43F0B566-83F1-4AD4-933F-FE8D4B80DBB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
35+
{43F0B566-83F1-4AD4-933F-FE8D4B80DBB9}.Release|Any CPU.Build.0 = Release|Any CPU
3036
EndGlobalSection
3137
GlobalSection(SolutionProperties) = preSolution
3238
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)