React to fallback changes

HaoK · HaoK · commit 5f06906087b7 · 2014-11-20T17:25:16.000-08:00
diff --git a/test/Microsoft.AspNet.Security.Test/Cookies/CookieMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/Cookies/CookieMiddlewareTests.cs
@@ -15,6 +15,7 @@
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Security;
+using Microsoft.AspNet.Security.DataProtection;
 using Microsoft.AspNet.TestHost;
 using Shouldly;
 using Xunit;
@@ -365,8 +366,9 @@ private static async Task<XElement> GetAuthData(TestServer server, string url, s
 
         private static TestServer CreateServer(Action<CookieAuthenticationOptions> configureOptions, Func<HttpContext, Task> testpath = null)
         {
-            return TestServer.Create(TestServices.CreateTestServices(), app =>
+            return TestServer.Create(app =>
             {
+                app.UseServices(services => services.Add(DataProtectionServices.GetDefaultServices()));
                 app.UseCookieAuthentication(configureOptions);
                 app.Use(async (context, next) =>
                 {
diff --git a/test/Microsoft.AspNet.Security.Test/Facebook/FacebookMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/Facebook/FacebookMiddlewareTests.cs
@@ -9,11 +9,9 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Security;
-using Microsoft.AspNet.Security.Cookies;
+using Microsoft.AspNet.Security.DataProtection;
 using Microsoft.AspNet.TestHost;
 using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
 using Shouldly;
 using Xunit;
 
@@ -29,6 +27,7 @@ public async Task ChallengeWillTriggerApplyRedirectEvent()
                 {
                     app.UseServices(services =>
                     {
+                        services.Add(DataProtectionServices.GetDefaultServices());
                         services.ConfigureFacebookAuthentication(options =>
                         {
                             options.AppId = "Test App Id";
@@ -72,6 +71,7 @@ public async Task ChallengeWillTriggerRedirection()
                 {
                     app.UseServices(services =>
                     {
+                        services.Add(DataProtectionServices.GetDefaultServices());
                         services.ConfigureFacebookAuthentication(options =>
                         {
                             options.AppId = "Test App Id";
@@ -107,7 +107,7 @@ public async Task ChallengeWillTriggerRedirection()
 
         private static TestServer CreateServer(Action<IApplicationBuilder> configure, Func<HttpContext, bool> handler)
         {
-            return TestServer.Create(TestServices.CreateTestServices(), app =>
+            return TestServer.Create(app =>
             {
                 if (configure != null)
                 {
diff --git a/test/Microsoft.AspNet.Security.Test/Google/GoogleMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/Google/GoogleMiddlewareTests.cs
@@ -463,10 +463,11 @@ private static async Task<Transaction> SendAsync(TestServer server, string uri,
 
         private static TestServer CreateServer(Action<GoogleAuthenticationOptions> configureOptions, Func<HttpContext, Task> testpath = null)
         {
-            return TestServer.Create(TestServices.CreateTestServices(), app =>
+            return TestServer.Create(app =>
             {
                 app.UseServices(services =>
                 {
+                    services.Add(DataProtectionServices.GetDefaultServices());
                     services.Configure<ExternalAuthenticationOptions>(options =>
                     {
                         options.SignInAsAuthenticationType = CookieAuthenticationType;
diff --git a/test/Microsoft.AspNet.Security.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs
@@ -161,10 +161,11 @@ public async Task AuthenticatedEventCanGetRefreshToken()
 
         private static TestServer CreateServer(Action<MicrosoftAccountAuthenticationOptions> configureOptions, Func<HttpContext, bool> handler)
         {
-            return TestServer.Create(TestServices.CreateTestServices(), app =>
+            return TestServer.Create(app =>
             {
                 app.UseServices(services =>
                 {
+                    services.Add(DataProtectionServices.GetDefaultServices());
                     services.Configure<ExternalAuthenticationOptions>(options =>
                     {
                         options.SignInAsAuthenticationType = "External";
diff --git a/test/Microsoft.AspNet.Security.Test/TestServices.cs b/test/Microsoft.AspNet.Security.Test/TestServices.cs
diff --git a/test/Microsoft.AspNet.Security.Test/Twitter/TwitterMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/Twitter/TwitterMiddlewareTests.cs
@@ -17,6 +17,7 @@
 using Xunit;
 using Microsoft.Framework.OptionsModel;
 using Microsoft.Framework.DependencyInjection;
+using Microsoft.AspNet.Security.DataProtection;
 
 namespace Microsoft.AspNet.Security.Twitter
 {
@@ -107,10 +108,11 @@ public async Task ChallengeWillTriggerRedirection()
 
         private static TestServer CreateServer(Action<IApplicationBuilder> configure, Func<HttpContext, bool> handler)
         {
-            return TestServer.Create(TestServices.CreateTestServices(), app =>
+            return TestServer.Create(app =>
             {
                 app.UseServices(services =>
                 {
+                    services.Add(DataProtectionServices.GetDefaultServices());
                     services.Configure<ExternalAuthenticationOptions>(options =>
                     {
                         options.SignInAsAuthenticationType = "External";

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`using Microsoft.AspNet.Builder;`
`16`	`16`	`using Microsoft.AspNet.Http;`
`17`	`17`	`using Microsoft.AspNet.Http.Security;`
	`18`	`+using Microsoft.AspNet.Security.DataProtection;`
`18`	`19`	`using Microsoft.AspNet.TestHost;`
`19`	`20`	`using Shouldly;`
`20`	`21`	`using Xunit;`
`@@ -365,8 +366,9 @@ private static async Task<XElement> GetAuthData(TestServer server, string url, s`
`365`	`366`
`366`	`367`	`private static TestServer CreateServer(Action<CookieAuthenticationOptions> configureOptions, Func<HttpContext, Task> testpath = null)`
`367`	`368`	`{`
`368`		`- return TestServer.Create(TestServices.CreateTestServices(), app =>`
	`369`	`+ return TestServer.Create(app =>`
`369`	`370`	`{`
	`371`	`+ app.UseServices(services => services.Add(DataProtectionServices.GetDefaultServices()));`
`370`	`372`	`app.UseCookieAuthentication(configureOptions);`
`371`	`373`	`app.Use(async (context, next) =>`
`372`	`374`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,9 @@`
`9`	`9`	`using System.Threading.Tasks;`
`10`	`10`	`using Microsoft.AspNet.Builder;`
`11`	`11`	`using Microsoft.AspNet.Http;`
`12`		`-using Microsoft.AspNet.Http.Security;`
`13`		`-using Microsoft.AspNet.Security.Cookies;`
	`12`	`+using Microsoft.AspNet.Security.DataProtection;`
`14`	`13`	`using Microsoft.AspNet.TestHost;`
`15`	`14`	`using Microsoft.Framework.DependencyInjection;`
`16`		`-using Microsoft.Framework.OptionsModel;`
`17`	`15`	`using Shouldly;`
`18`	`16`	`using Xunit;`
`19`	`17`
`@@ -29,6 +27,7 @@ public async Task ChallengeWillTriggerApplyRedirectEvent()`
`29`	`27`	`{`
`30`	`28`	`app.UseServices(services =>`
`31`	`29`	`{`
	`30`	`+ services.Add(DataProtectionServices.GetDefaultServices());`
`32`	`31`	`services.ConfigureFacebookAuthentication(options =>`
`33`	`32`	`{`
`34`	`33`	`options.AppId = "Test App Id";`
`@@ -72,6 +71,7 @@ public async Task ChallengeWillTriggerRedirection()`
`72`	`71`	`{`
`73`	`72`	`app.UseServices(services =>`
`74`	`73`	`{`
	`74`	`+ services.Add(DataProtectionServices.GetDefaultServices());`
`75`	`75`	`services.ConfigureFacebookAuthentication(options =>`
`76`	`76`	`{`
`77`	`77`	`options.AppId = "Test App Id";`
`@@ -107,7 +107,7 @@ public async Task ChallengeWillTriggerRedirection()`
`107`	`107`
`108`	`108`	`private static TestServer CreateServer(Action<IApplicationBuilder> configure, Func<HttpContext, bool> handler)`
`109`	`109`	`{`
`110`		`- return TestServer.Create(TestServices.CreateTestServices(), app =>`
	`110`	`+ return TestServer.Create(app =>`
`111`	`111`	`{`
`112`	`112`	`if (configure != null)`
`113`	`113`	`{`
Original file line number	Diff line number	Diff line change
`@@ -463,10 +463,11 @@ private static async Task<Transaction> SendAsync(TestServer server, string uri,`
`463`	`463`
`464`	`464`	`private static TestServer CreateServer(Action<GoogleAuthenticationOptions> configureOptions, Func<HttpContext, Task> testpath = null)`
`465`	`465`	`{`
`466`		`- return TestServer.Create(TestServices.CreateTestServices(), app =>`
	`466`	`+ return TestServer.Create(app =>`
`467`	`467`	`{`
`468`	`468`	`app.UseServices(services =>`
`469`	`469`	`{`
	`470`	`+ services.Add(DataProtectionServices.GetDefaultServices());`
`470`	`471`	`services.Configure<ExternalAuthenticationOptions>(options =>`
`471`	`472`	`{`
`472`	`473`	`options.SignInAsAuthenticationType = CookieAuthenticationType;`
Original file line number	Diff line number	Diff line change
`@@ -161,10 +161,11 @@ public async Task AuthenticatedEventCanGetRefreshToken()`
`161`	`161`
`162`	`162`	`private static TestServer CreateServer(Action<MicrosoftAccountAuthenticationOptions> configureOptions, Func<HttpContext, bool> handler)`
`163`	`163`	`{`
`164`		`- return TestServer.Create(TestServices.CreateTestServices(), app =>`
	`164`	`+ return TestServer.Create(app =>`
`165`	`165`	`{`
`166`	`166`	`app.UseServices(services =>`
`167`	`167`	`{`
	`168`	`+ services.Add(DataProtectionServices.GetDefaultServices());`
`168`	`169`	`services.Configure<ExternalAuthenticationOptions>(options =>`
`169`	`170`	`{`
`170`	`171`	`options.SignInAsAuthenticationType = "External";`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`using Xunit;`
`18`	`18`	`using Microsoft.Framework.OptionsModel;`
`19`	`19`	`using Microsoft.Framework.DependencyInjection;`
	`20`	`+using Microsoft.AspNet.Security.DataProtection;`
`20`	`21`
`21`	`22`	`namespace Microsoft.AspNet.Security.Twitter`
`22`	`23`	`{`
`@@ -107,10 +108,11 @@ public async Task ChallengeWillTriggerRedirection()`
`107`	`108`
`108`	`109`	`private static TestServer CreateServer(Action<IApplicationBuilder> configure, Func<HttpContext, bool> handler)`
`109`	`110`	`{`
`110`		`- return TestServer.Create(TestServices.CreateTestServices(), app =>`
	`111`	`+ return TestServer.Create(app =>`
`111`	`112`	`{`
`112`	`113`	`app.UseServices(services =>`
`113`	`114`	`{`
	`115`	`+ services.Add(DataProtectionServices.GetDefaultServices());`
`114`	`116`	`services.Configure<ExternalAuthenticationOptions>(options =>`
`115`	`117`	`{`
`116`	`118`	`options.SignInAsAuthenticationType = "External";`