moved EndpointDriver and its associated classes to FubuMVC, removed S…

…erenity out of the main FubuMVC repo
vyrak · May 12, 2012 · 10b2adc · 10b2adc
1 parent dd0713e
commit 10b2adc
Show file tree

Hide file tree

Showing 185 changed files with 13 additions and 10,704 deletions.
diff --git a/rakefile.rb b/rakefile.rb
@@ -79,13 +79,8 @@ def waitfor(&block)
   raise 'waitfor timeout expired' if checks > 10
 end
 
-desc "Packages the Serenity bottle files"
-task :bottle_serenity do
-  bottles("assembly-pak src/Serenity")
-end
-
 desc "Compiles the app"
-task :compile => [:restore_if_missing, :clean, :version, :bottle_serenity] do
+task :compile => [:restore_if_missing, :clean, :version] do
   MSBuildRunner.compile :compilemode => COMPILE_TARGET, :solutionfile => 'src/FubuMVC.sln', :clrversion => CLR_TOOLS_VERSION
   #AspNetCompilerRunner.compile :webPhysDir => "src/FubuMVC.HelloWorld", :webVirDir => "localhost/xyzzyplugh"
 
@@ -127,17 +122,6 @@ def copyOutputFiles(fromDir, filePattern, outDir)
   runner.executeTests ['FubuMVC.Tests', 'FubuMVC.Spark.Tests', 'FubuMVC.Razor.Tests']
 end
 
-desc "Runs the unit tests for Serenity"
-task :serenity_test => :compile do
-  runner = NUnitRunner.new :compilemode => COMPILE_TARGET, :source => 'src', :platform => 'x86'
-  runner.executeTests ['Serenity.Testing']
-end
-
-
-desc "Runs the StoryTeller suite of end to end tests.  IIS must be running first"
-task :storyteller => [:compile] do
-  storyteller("Storyteller.xml output/st-results.htm")
-end
 
 desc "Set up the virtual directories for the HelloWorld applications"
 task :virtual_dir => [:compile] do
@@ -161,16 +145,6 @@ def self.bottles(args)
   sh "#{bottles} #{args}"
 end
 
-def self.storyteller(args)
-st = Platform.runtime(Nuget.tool("Storyteller", "StorytellerRunner.exe")) 
-sh "#{st} #{args}"
-end
-
-desc "Runs the StoryTeller UI"
-task :run_st do
-  st = Platform.runtime(Nuget.tool("Storyteller", "StorytellerUI.exe"))
-  sh st 
-end
 
 def self.fubu(args)
   fubu = Platform.runtime("src/fubu/bin/#{COMPILE_TARGET}/fubu.exe")

diff --git a/src/Serenity/Endpoints/EndpointDriver.cs → src/FubuMVC.Core/Endpoints/EndpointDriver.cs b/src/Serenity/Endpoints/EndpointDriver.cs → src/FubuMVC.Core/Endpoints/EndpointDriver.cs
@@ -4,19 +4,16 @@
 using System.Linq.Expressions;
 using System.Net;
 using System.Text;
-using System.Web;
 using System.Web.Script.Serialization;
 using System.Xml.Serialization;
 using FubuCore;
 using FubuCore.Reflection;
-using FubuMVC.Core;
 using FubuMVC.Core.Assets.Files;
-using FubuMVC.Core.Http;
 using FubuMVC.Core.Runtime;
 using FubuMVC.Core.Urls;
 using System.Linq;
 
-namespace Serenity.Endpoints
+namespace FubuMVC.Core.Endpoints
 {
     public enum ContentFormat
     {

diff --git a/src/Serenity/Endpoints/EndpointFormatting.cs → ...uMVC.Core/Endpoints/EndpointFormatting.cs b/src/Serenity/Endpoints/EndpointFormatting.cs → ...uMVC.Core/Endpoints/EndpointFormatting.cs
@@ -1,4 +1,4 @@
-namespace Serenity.Endpoints
+namespace FubuMVC.Core.Endpoints
 {
     public enum EndpointFormatting
     {

diff --git a/src/Serenity/Endpoints/EndpointInvocation.cs → ...uMVC.Core/Endpoints/EndpointInvocation.cs b/src/Serenity/Endpoints/EndpointInvocation.cs → ...uMVC.Core/Endpoints/EndpointInvocation.cs
@@ -6,10 +6,8 @@
 using System.Xml.Serialization;
 using FubuCore;
 
-namespace Serenity.Endpoints
+namespace FubuMVC.Core.Endpoints
 {
-    using FubuMVC.Core;
-
     public class EndpointInvocation
     {
         public string Accept = "*/*";

diff --git a/src/Serenity/Endpoints/HttpResponse.cs → src/FubuMVC.Core/Endpoints/HttpResponse.cs b/src/Serenity/Endpoints/HttpResponse.cs → src/FubuMVC.Core/Endpoints/HttpResponse.cs
@@ -1,15 +1,11 @@
-using System;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Text;
 using System.Web.Script.Serialization;
 using System.Xml;
-using FubuMVC.Core.Runtime;
-using HtmlTags;
-using StoryTeller.Assertions;
 
-namespace Serenity.Endpoints
+namespace FubuMVC.Core.Endpoints
 {
     public class HttpResponse
     {

diff --git a/...Endpoints/WebRequestResponseExtensions.cs → ...Endpoints/WebRequestResponseExtensions.cs b/...Endpoints/WebRequestResponseExtensions.cs → ...Endpoints/WebRequestResponseExtensions.cs
@@ -5,7 +5,7 @@
 using System.Threading;
 using FubuCore;
 
-namespace Serenity.Endpoints
+namespace FubuMVC.Core.Endpoints
 {
     public static class WebRequestResponseExtensions
     {

diff --git a/src/FubuMVC.Core/FubuMVC.Core.csproj b/src/FubuMVC.Core/FubuMVC.Core.csproj
@@ -92,6 +92,11 @@
     <Compile Include="Assets\RecordingAssetRegistration.cs" />
     <Compile Include="Behaviors\AsyncContinueWithBehavior.cs" />
     <Compile Include="Behaviors\AsyncInterceptExceptionBehavior.cs" />
+    <Compile Include="Endpoints\EndpointDriver.cs" />
+    <Compile Include="Endpoints\EndpointFormatting.cs" />
+    <Compile Include="Endpoints\EndpointInvocation.cs" />
+    <Compile Include="Endpoints\HttpResponse.cs" />
+    <Compile Include="Endpoints\WebRequestResponseExtensions.cs" />
     <Compile Include="Runtime\Conditionals\Always.cs" />
     <Compile Include="Behaviors\Conditional\ConditionalBehavior.cs" />
     <Compile Include="Behaviors\Conditional\ConditionalBehaviorInvoker.cs" />

diff --git a/src/FubuMVC.sln b/src/FubuMVC.sln
@@ -48,10 +48,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FubuMVC.GettingStarted", "F
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickStart", "QuickStart\QuickStart.csproj", "{66A9D435-DC25-4DE1-99A8-003C54B0111B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serenity", "Serenity\Serenity.csproj", "{900A0419-3579-4DAE-85BE-71A3E4B34239}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serenity.Testing", "Serenity.Testing\Serenity.Testing.csproj", "{5E69E72A-B92F-47BE-B7F7-6E6A926EC90F}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FubuMVC.OwinHost", "FubuMVC.OwinHost\FubuMVC.OwinHost.csproj", "{EA10DF80-FD95-4172-BC18-DB0DFB279844}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FubuMVC.OwinHost.Testing", "FubuMVC.OwinHost.Testing\FubuMVC.OwinHost.Testing.csproj", "{E3C7DC9E-332B-4272-9486-BCB573AA9E22}"
@@ -62,8 +58,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FubuMVC.Diagnostics", "Fubu
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FubuMVC.Diagnostics.Tests", "FubuMVC.Diagnostics.Tests\FubuMVC.Diagnostics.Tests.csproj", "{99A53042-2455-464F-A68E-00C401B177C0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SerenityRunner", "SerenityRunner\SerenityRunner.csproj", "{FC5172BC-C96A-4656-B87B-36978B19AD85}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KayakTestApplication", "KayakTestApplication\KayakTestApplication.csproj", "{68CC89AB-EE8B-4B2D-9BA0-8B0FBF460446}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FubuMVC.Razor", "FubuMVC.Razor\FubuMVC.Razor.csproj", "{A88246A6-2A7A-4964-902E-A5A7FDAAA9D4}"
@@ -387,36 +381,6 @@ Global
 		{66A9D435-DC25-4DE1-99A8-003C54B0111B}.Retail|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{66A9D435-DC25-4DE1-99A8-003C54B0111B}.Retail|Mixed Platforms.Build.0 = Release|Any CPU
 		{66A9D435-DC25-4DE1-99A8-003C54B0111B}.Retail|x86.ActiveCfg = Release|Any CPU
-		{900A0419-3579-4DAE-85BE-71A3E4B34239}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{900A0419-3579-4DAE-85BE-71A3E4B34239}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{900A0419-3579-4DAE-85BE-71A3E4B34239}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{900A0419-3579-4DAE-85BE-71A3E4B34239}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{900A0419-3579-4DAE-85BE-71A3E4B34239}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{900A0419-3579-4DAE-85BE-71A3E4B34239}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{900A0419-3579-4DAE-85BE-71A3E4B34239}.Release|Any CPU.Build.0 = Release|Any CPU
-		{900A0419-3579-4DAE-85BE-71A3E4B34239}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{900A0419-3579-4DAE-85BE-71A3E4B34239}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{900A0419-3579-4DAE-85BE-71A3E4B34239}.Release|x86.ActiveCfg = Release|Any CPU
-		{900A0419-3579-4DAE-85BE-71A3E4B34239}.Retail|Any CPU.ActiveCfg = Release|Any CPU
-		{900A0419-3579-4DAE-85BE-71A3E4B34239}.Retail|Any CPU.Build.0 = Release|Any CPU
-		{900A0419-3579-4DAE-85BE-71A3E4B34239}.Retail|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{900A0419-3579-4DAE-85BE-71A3E4B34239}.Retail|Mixed Platforms.Build.0 = Release|Any CPU
-		{900A0419-3579-4DAE-85BE-71A3E4B34239}.Retail|x86.ActiveCfg = Release|Any CPU
-		{5E69E72A-B92F-47BE-B7F7-6E6A926EC90F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5E69E72A-B92F-47BE-B7F7-6E6A926EC90F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5E69E72A-B92F-47BE-B7F7-6E6A926EC90F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5E69E72A-B92F-47BE-B7F7-6E6A926EC90F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5E69E72A-B92F-47BE-B7F7-6E6A926EC90F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5E69E72A-B92F-47BE-B7F7-6E6A926EC90F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5E69E72A-B92F-47BE-B7F7-6E6A926EC90F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5E69E72A-B92F-47BE-B7F7-6E6A926EC90F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5E69E72A-B92F-47BE-B7F7-6E6A926EC90F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5E69E72A-B92F-47BE-B7F7-6E6A926EC90F}.Release|x86.ActiveCfg = Release|Any CPU
-		{5E69E72A-B92F-47BE-B7F7-6E6A926EC90F}.Retail|Any CPU.ActiveCfg = Release|Any CPU
-		{5E69E72A-B92F-47BE-B7F7-6E6A926EC90F}.Retail|Any CPU.Build.0 = Release|Any CPU
-		{5E69E72A-B92F-47BE-B7F7-6E6A926EC90F}.Retail|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5E69E72A-B92F-47BE-B7F7-6E6A926EC90F}.Retail|Mixed Platforms.Build.0 = Release|Any CPU
-		{5E69E72A-B92F-47BE-B7F7-6E6A926EC90F}.Retail|x86.ActiveCfg = Release|Any CPU
 		{EA10DF80-FD95-4172-BC18-DB0DFB279844}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EA10DF80-FD95-4172-BC18-DB0DFB279844}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EA10DF80-FD95-4172-BC18-DB0DFB279844}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -492,21 +456,6 @@ Global
 		{99A53042-2455-464F-A68E-00C401B177C0}.Retail|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{99A53042-2455-464F-A68E-00C401B177C0}.Retail|Mixed Platforms.Build.0 = Release|Any CPU
 		{99A53042-2455-464F-A68E-00C401B177C0}.Retail|x86.ActiveCfg = Release|Any CPU
-		{FC5172BC-C96A-4656-B87B-36978B19AD85}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{FC5172BC-C96A-4656-B87B-36978B19AD85}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{FC5172BC-C96A-4656-B87B-36978B19AD85}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{FC5172BC-C96A-4656-B87B-36978B19AD85}.Debug|x86.ActiveCfg = Debug|x86
-		{FC5172BC-C96A-4656-B87B-36978B19AD85}.Debug|x86.Build.0 = Debug|x86
-		{FC5172BC-C96A-4656-B87B-36978B19AD85}.Release|Any CPU.ActiveCfg = Release|x86
-		{FC5172BC-C96A-4656-B87B-36978B19AD85}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{FC5172BC-C96A-4656-B87B-36978B19AD85}.Release|Mixed Platforms.Build.0 = Release|x86
-		{FC5172BC-C96A-4656-B87B-36978B19AD85}.Release|x86.ActiveCfg = Release|x86
-		{FC5172BC-C96A-4656-B87B-36978B19AD85}.Release|x86.Build.0 = Release|x86
-		{FC5172BC-C96A-4656-B87B-36978B19AD85}.Retail|Any CPU.ActiveCfg = Release|x86
-		{FC5172BC-C96A-4656-B87B-36978B19AD85}.Retail|Mixed Platforms.ActiveCfg = Release|x86
-		{FC5172BC-C96A-4656-B87B-36978B19AD85}.Retail|Mixed Platforms.Build.0 = Release|x86
-		{FC5172BC-C96A-4656-B87B-36978B19AD85}.Retail|x86.ActiveCfg = Release|x86
-		{FC5172BC-C96A-4656-B87B-36978B19AD85}.Retail|x86.Build.0 = Release|x86
 		{68CC89AB-EE8B-4B2D-9BA0-8B0FBF460446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{68CC89AB-EE8B-4B2D-9BA0-8B0FBF460446}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{68CC89AB-EE8B-4B2D-9BA0-8B0FBF460446}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

diff --git a/src/Serenity.Testing/BrowserFixture.cs b/src/Serenity.Testing/BrowserFixture.cs