lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-23 21:32:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.9.x' into dev

Browse Source 
Conflicts:
	src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
	src/Orchard/Data/Migration/AutomaticDataMigrations.cs
	src/Orchard/Environment/DefaultOrchardShell.cs
This commit is contained in:
Sebastien Ros
2015-09-08 17:19:58 -07:00
parent 06bf569774 e8f0ba6ec7
commit b26690d747
77 changed files with 684 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs
View File

@@ -110,23 +110,23 @@ namespace Orchard.Tests.Modules.Recipes.Services {
[Test]
public void HarvestRecipesFailsToFindRecipesWhenCalledWithNotExistingExtension() {
var recipes = (List<Recipe>)_recipeHarvester.HarvestRecipes("cantfindme");
var recipes = _recipeHarvester.HarvestRecipes("cantfindme");
Assert.That(recipes.Count, Is.EqualTo(0));
Assert.That(recipes.Count(), Is.EqualTo(0));
}
[Test]
public void HarvestRecipesShouldHarvestRecipeXmlFiles() {
var recipes = (List<Recipe>)_recipeHarvester.HarvestRecipes("Sample1");
Assert.That(recipes.Count, Is.EqualTo(1));
var recipes = _recipeHarvester.HarvestRecipes("Sample1");
Assert.That(recipes.Count(), Is.EqualTo(1));
}
[Test]
public void ParseRecipeLoadsRecipeMetaDataIntoModel() {
var recipes = (List<Recipe>)_recipeHarvester.HarvestRecipes("Sample1");
Assert.That(recipes.Count, Is.EqualTo(1));
var recipes = _recipeHarvester.HarvestRecipes("Sample1");
Assert.That(recipes.Count(), Is.EqualTo(1));
var sampleRecipe = recipes[0];
var sampleRecipe = recipes.First();
Assert.That(sampleRecipe.Name, Is.EqualTo("cms"));
Assert.That(sampleRecipe.Description, Is.EqualTo("a sample Orchard recipe describing a cms"));
Assert.That(sampleRecipe.Author, Is.EqualTo("orchard"));