Skip to content

Commit

Permalink
Merge branch 'release/v0.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Will-Bill
Will-Bill committed Jun 15, 2015
2 parents 68d307c + cc3c8c3 commit 622d930
Show file tree
Hide file tree
Showing 1,429 changed files with 60,545 additions and 18,240 deletions.
340 changes: 340 additions & 0 deletions LICENSE
View file

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion MrCMS Ecommerce.sln
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30501.0
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{0F690EEC-BB1B-4916-BA16-682D9D7A7A19}"
EndProject
Expand All @@ -23,6 +23,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MrCMS.EcommerceApp.Tests",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MrCMS.PaypointService", "MrCMS.PaypointService\MrCMS.PaypointService.csproj", "{94C17669-9AC5-43D3-81B2-3AD0D2F223DE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{57351305-8ED2-4AF8-81AA-6EC95488B974}"
ProjectSection(SolutionItems) = preProject
LICENSE = LICENSE
README.md = README.md
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
7 changes: 4 additions & 3 deletions MrCMS.AmazonApp.Tests/Admin/Controllers/AppControllerTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using MrCMS.Web.Apps.Amazon.Models;
using MrCMS.Web.Apps.Amazon.Services.Analytics;
using MrCMS.Web.Apps.Amazon.Services.Logs;
using MrCMS.Website.ActionResults;
using Xunit;
using System;

Expand Down Expand Up @@ -86,7 +87,7 @@ public void AppController_Revenue_ReturnsJsonResult()
{
var result = _appController.Revenue(DateTime.Now.AddDays(-7), DateTime.Now);

result.Should().BeOfType<JsonResult>();
result.Should().BeOfType<JsonNetResult>();
}

[Fact]
Expand All @@ -105,7 +106,7 @@ public void AppController_ProductsSold_ReturnsJsonResult()
{
var result = _appController.ProductsSold(DateTime.Now.AddDays(-7), DateTime.Now);

result.Should().BeOfType<JsonResult>();
result.Should().BeOfType<JsonNetResult>();
}

[Fact]
Expand All @@ -124,7 +125,7 @@ public void AppController_ProgressBarStatus_ReturnsJsonResult()
{
var result = _appController.ProgressBarStatus(new AmazonSyncModel(){TaskId = Guid.NewGuid()});

result.Should().BeOfType<JsonResult>();
result.Should().BeOfType<JsonNetResult>();
}

[Fact]
Expand Down
9 changes: 5 additions & 4 deletions MrCMS.AmazonApp.Tests/Admin/Controllers/ListingControllerTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using MrCMS.Web.Apps.Amazon.Services.Listings;
using MrCMS.Web.Apps.Amazon.Services.Listings.Sync;
using MrCMS.Web.Apps.Amazon.Settings;
using MrCMS.Website.ActionResults;
using Xunit;

namespace MrCMS.AmazonApp.Tests.Admin.Controllers
Expand Down Expand Up @@ -221,7 +222,7 @@ public void ListingController_SyncOne_ShouldReturnJsonResult()
{
var result = _listingController.SyncOne(new AmazonSyncModel());

result.Should().BeOfType<JsonResult>();
result.Should().BeOfType<JsonNetResult>();
}

[Fact]
Expand Down Expand Up @@ -291,7 +292,7 @@ public void ListingController_SyncMany_ShouldReturnJsonResult()
{
var result = _listingController.SyncMany(new AmazonSyncModel());

result.Should().BeOfType<JsonResult>();
result.Should().BeOfType<JsonNetResult>();
}

[Fact]
Expand Down Expand Up @@ -361,7 +362,7 @@ public void ListingController_CloseOnePOST_ShouldReturnJsonResult()
{
var result = _listingController.CloseOne_POST(new AmazonSyncModel());

result.Should().BeOfType<JsonResult>();
result.Should().BeOfType<JsonNetResult>();
}

[Fact]
Expand Down Expand Up @@ -431,7 +432,7 @@ public void ListingController_CloseManyPOST_ShouldReturnJsonResult()
{
var result = _listingController.CloseMany_POST(new AmazonSyncModel());

result.Should().BeOfType<JsonResult>();
result.Should().BeOfType<JsonNetResult>();
}

[Fact]
Expand Down
44 changes: 34 additions & 10 deletions MrCMS.AmazonApp.Tests/App.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
<system.data>
<DbProviderFactories>
Expand All @@ -14,43 +14,43 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.82.0" newVersion="1.0.82.0" />
<bindingRedirect oldVersion="0.0.0.0-1.0.94.0" newVersion="1.0.94.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.6.4.0" newVersion="6.6.4.0" />
<bindingRedirect oldVersion="0.0.0.0-6.9.5.0" newVersion="6.9.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.1.4000" newVersion="3.3.1.4000" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.6.0.0" newVersion="5.6.0.0" />
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
Expand All @@ -60,6 +60,30 @@
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.AspNet.Identity.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.AspNet.SignalR.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Loading

0 comments on commit 622d930

Please sign in to comment.