Merge pull request #45 from crupest/avatar-cache

Add 304 response for If-Modified-Since in avatar.

1 files changed, 11 insertions, 6 deletions

diff --git a/Timeline.Tests/UserAvatarServiceTest.cs b/Timeline.Tests/UserAvatarServiceTest.cs
index 03b64a6b..f11da4f0 100644
--- a/Timeline.Tests/UserAvatarServiceTest.cs
+++ b/Timeline.Tests/UserAvatarServiceTest.cs
@@ -17,11 +17,15 @@ namespace Timeline.Tests
 {

     public class MockDefaultUserAvatarProvider : IDefaultUserAvatarProvider

     {

-        public static Avatar Avatar { get; } = new Avatar { Type = "image/test", Data = Encoding.ASCII.GetBytes("test") };

+        public static AvatarInfo AvatarInfo { get; } = new AvatarInfo

+        {

+            Avatar = new Avatar { Type = "image/test", Data = Encoding.ASCII.GetBytes("test") },

+            LastModified = DateTime.Now

+        };

 

-        public Task<Avatar> GetDefaultAvatar()

+        public Task<AvatarInfo> GetDefaultAvatar()

         {

-            return Task.FromResult(Avatar);

+            return Task.FromResult(AvatarInfo);

         }

     }

 

@@ -153,7 +157,7 @@ namespace Timeline.Tests
         public async Task GetAvatar_ShouldReturn_Default()

         {

             const string username = MockUsers.UserUsername;

-            (await _service.GetAvatar(username)).Should().BeEquivalentTo(await _mockDefaultUserAvatarProvider.GetDefaultAvatar());

+            (await _service.GetAvatar(username)).Avatar.Should().BeEquivalentTo((await _mockDefaultUserAvatarProvider.GetDefaultAvatar()).Avatar);

         }

 

         [Fact]

@@ -173,7 +177,7 @@ namespace Timeline.Tests
                 await context.SaveChangesAsync();

             }

 

-            (await _service.GetAvatar(username)).Should().BeEquivalentTo(MockAvatar);

+            (await _service.GetAvatar(username)).Avatar.Should().BeEquivalentTo(MockAvatar);

         }

 

         [Fact]

@@ -223,7 +227,8 @@ namespace Timeline.Tests
 

             // delete

             await _service.SetAvatar(username, null);

-            user.Avatar.Should().BeNull();

+            user.Avatar.Type.Should().BeNull();

+            user.Avatar.Data.Should().BeNull();

         }

     }

 }