lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 03:25:23 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix SpecFlow tests

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-07-14 22:34:57 -07:00
parent 3945eeb0a2
commit e55cff760d
5 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Orchard.Specs/Bindings/OrchardSiteFactory.cs
View File

@@ -16,15 +16,16 @@ namespace Orchard.Specs.Bindings {
var webApp = Binding<WebAppHosting>();
webApp.GivenIHaveACleanSiteWith(TableData(
new { extension = "module", names = "Orchard.Setup, Orchard.Modules, Orchard.Themes, Orchard.Users, Orchard.Roles, Orchard.Pages, Orchard.Comments, Orchard.Tags, TinyMce" },
new { extension = "core", names = "Common, Dashboard, Feeds, HomePage, Navigation, Scheduling, Settings, XmlRpc" },
new { extension = "module", names = "Orchard.Setup, Orchard.Modules, Orchard.Themes, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Tags, TinyMce" },
new { extension = "core", names = "Common, Dashboard, Feeds, HomePage, Navigation, PublishLater, Routable, Scheduling, Settings, XmlRpc" },
new { extension = "theme", names = "SafeMode, Classic" }));
webApp.WhenIGoTo("Setup");
webApp.WhenIFillIn(TableData(
new { name = "SiteName", value = "My Site" },
new { name = "AdminPassword", value = "6655321" }));
new { name = "AdminPassword", value = "6655321" },
new { name = "ConfirmPassword", value = "6655321" }));
webApp.WhenIHit("Finish Setup");
}

9
src/Orchard.Specs/Bindings/WebAppHosting.cs
View File

@@ -1,22 +1,13 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Remoting;
using System.Web;
using System.Web.Hosting;
using System.Xml.Linq;
using Castle.Core.Logging;
using HtmlAgilityPack;
using log4net.Appender;
using log4net.Core;
using log4net.Repository;
using NUnit.Framework;
using Orchard.Specs.Hosting;
using Orchard.Specs.Util;
using TechTalk.SpecFlow;
namespace Orchard.Specs.Bindings {

1
src/Orchard.Specs/Hosting/Orchard.Web/Web.config
View File

@@ -202,6 +202,7 @@
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="App_Data/Dependencies"/>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0"/>

24
src/Orchard.Specs/Hosting/WebHost.cs
View File

@@ -31,6 +31,19 @@ namespace Orchard.Specs.Hosting {
.ShallowCopy("*.dll", _tempSite.Combine("bin"))
.ShallowCopy("*.pdb", _tempSite.Combine("bin"));
// Copy SqlCe binaries
if (_orchardWebPath.Combine("bin").Combine("x86").IsDirectory) {
_orchardWebPath.Combine("bin").Combine("x86")
.ShallowCopy("*.dll", _tempSite.Combine("bin").Combine("x86"))
.ShallowCopy("*.pdb", _tempSite.Combine("bin").Combine("x86"));
}
if (_orchardWebPath.Combine("bin").Combine("amd64").IsDirectory) {
_orchardWebPath.Combine("bin").Combine("amd64")
.ShallowCopy("*.dll", _tempSite.Combine("bin").Combine("amd64"))
.ShallowCopy("*.pdb", _tempSite.Combine("bin").Combine("amd64"));
}
baseDir
.ShallowCopy("*.dll", _tempSite.Combine("bin"))
.ShallowCopy("*.exe", _tempSite.Combine("bin"))
@@ -54,7 +67,18 @@ namespace Orchard.Specs.Hosting {
public void CopyExtension(string extensionFolder, string extensionName) {
var sourceModule = _orchardWebPath.Combine(extensionFolder).Combine(extensionName);
var targetModule = _tempSite.Combine(extensionFolder).Combine(extensionName);
sourceModule.ShallowCopy("*.txt", targetModule);
//sourceModule.ShallowCopy("*.csproj", targetModule);
//sourceModule.DeepCopy("*.cs", targetModule);
if (sourceModule.Combine("bin").IsDirectory) {
sourceModule.Combine("bin").ShallowCopy("*.dll", targetModule.Combine("bin"));
sourceModule.Combine("bin").ShallowCopy("*.exe", targetModule.Combine("bin"));
sourceModule.Combine("bin").ShallowCopy("*.pdb", targetModule.Combine("bin"));
}
if (sourceModule.Combine("Views").IsDirectory)
sourceModule.Combine("Views").DeepCopy(targetModule.Combine("Views"));
}

7
src/Orchard.Specs/Util/PathExtensions.cs
View File

@@ -21,6 +21,13 @@ namespace Orchard.Specs.Util {
return sourcePath;
}
public static Path DeepCopy(this Path sourcePath, string pattern, Path targetPath) {
sourcePath
.GetFiles(pattern, true /*recursive*/)
.ForEach(file => FileCopy(sourcePath, targetPath, file));
return sourcePath;
}
public static Path ShallowCopy(this Path sourcePath, string pattern, Path targetPath) {
sourcePath
.GetFiles(pattern, false /*recursive*/)