Skip to content

Upgrade acceptance tests projects #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
using ChameleonForms.Attributes;
using ChameleonForms.ModelBinders;
using System;
using System.Linq;
using System.Web.Mvc;

[assembly: WebActivator.PreApplicationStartMethod(typeof(TestStack.Seleno.AcceptanceTests.Web.App_Start.RegisterChameleonFormsComponents), "Start")]
[assembly: WebActivator.PreApplicationStartMethod(typeof(TestStack.Seleno.AcceptanceTests.Web.RegisterChameleonFormsComponents), "Start")]

namespace TestStack.Seleno.AcceptanceTests.Web.App_Start
namespace TestStack.Seleno.AcceptanceTests.Web
{
public static class RegisterChameleonFormsComponents
{
public static void Start()
{
ModelBinders.Binders.Add(typeof(DateTime), new DateTimeModelBinder());
ModelBinders.Binders.Add(typeof(DateTime?), new DateTimeModelBinder());
DataAnnotationsModelValidatorProvider.RegisterAdapter(typeof(RequiredFlagsEnumAttribute), typeof(RequiredAttributeAdapter));
typeof(RegisterChameleonFormsComponents).Assembly.GetTypes().Where(t => t.IsEnum && t.GetCustomAttributes(typeof(FlagsAttribute), false).Any())
.ToList().ForEach(t =>
{
ModelBinders.Binders.Add(t, new FlagsEnumModelBinder());
ModelBinders.Binders.Add(typeof(Nullable<>).MakeGenericType(t), new FlagsEnumModelBinder());
});
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ public ViewModelEqualsConstraint(object expectedViewModel)
_expectedViewModel = expectedViewModel;
}

public override bool Matches(object actualViewModel)
public override ConstraintResult ApplyTo<TActual>(TActual actualViewModel)
{
foreach (var property in actualViewModel.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public))
{
if (property.IsReadonly())
continue;

var expectedValue = property.GetValue(_expectedViewModel, null);
var actualValue = property.GetValue(actualViewModel, null);

Expand All @@ -39,12 +40,7 @@ public override bool Matches(object actualViewModel)
Assert.That(actualValue, Is.EqualTo(expectedValue), property.Name);
}

return true;
}

public override void WriteDescriptionTo(MessageWriter writer)
{
throw new System.NotImplementedException();
return new ConstraintResult(this, actualViewModel, true);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,9 @@
var minute = match[timeParser.minuteIndex] * 1;
var is12Hour = timeParser.is12HourTime;

if (hour < 1)
if (is12Hour && (hour < 1 || hour > 12))
return false;
if (is12Hour && hour > 12)
return false;
if (!is12Hour && hour > 23)
if (!is12Hour && (hour < 0 || hour > 23))
return false;
if (minute < 0 || minute > 59)
return false;
Expand Down

Large diffs are not rendered by default.

24 changes: 10 additions & 14 deletions src/TestStack.Seleno.AcceptanceTests.Web/Views/Web.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@

<configuration>
<configSections>
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
</sectionGroup>
</configSections>

<system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<pages pageBaseType="System.Web.Mvc.WebViewPage">
<namespaces>
<add namespace="System.Web.Mvc" />
<add namespace="System.Web.Mvc.Ajax" />
<add namespace="System.Web.Mvc.Html" />
<add namespace="System.Web.Routing" />
<add namespace="ChameleonForms" /><add namespace="ChameleonForms.Component" /><add namespace="ChameleonForms.Enums" />
</namespaces>

<add namespace="ChameleonForms" /><add namespace="ChameleonForms.Component" /><add namespace="ChameleonForms.Enums" /></namespaces>
</pages>
</system.web.webPages.razor>

Expand All @@ -27,7 +27,7 @@

<system.web>
<httpHandlers>
<add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
<add path="*" verb="*" type="System.Web.HttpNotFoundHandler" />
</httpHandlers>

<!--
Expand All @@ -37,13 +37,9 @@
To change this behavior apply the ValidateInputAttribute to a
controller or action.
-->
<pages
validateRequest="false"
pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<pages validateRequest="false" pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<controls>
<add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
<add assembly="System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
</controls>
</pages>
</system.web>
Expand All @@ -52,7 +48,7 @@
<validation validateIntegratedModeConfiguration="false" />

<handlers>
<remove name="BlockViewHandler"/>
<remove name="BlockViewHandler" />
<add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
</handlers>
</system.webServer>
Expand Down
51 changes: 38 additions & 13 deletions src/TestStack.Seleno.AcceptanceTests.Web/Web.config
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="webpages:Version" value="2.0.0.0" />
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="PreserveLoginUrl" value="true" />
<add key="ClientValidationEnabled" value="true" />
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
</appSettings>
<!--
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.

The following attributes can be set on the <httpRuntime> tag.
<system.Web>
<httpRuntime targetFramework="4.7.1" />
</system.Web>
-->
<system.web>
<compilation debug="true" targetFramework="4.0" />
<pages>
<compilation debug="true" targetFramework="4.7.1" />
<pages controlRenderingCompatibilityVersion="4.0">
<namespaces>
<add namespace="System.Web.Helpers" />
<add namespace="System.Web.Mvc" />
Expand All @@ -24,17 +32,14 @@
<validation validateIntegratedModeConfiguration="false" />
<modules runAllManagedModulesForAllRequests="true" />

<handlers><remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" /><remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" /><remove name="ExtensionlessUrlHandler-Integrated-4.0" /><add name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" /><add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" /><add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" /></handlers></system.webServer>
<handlers>
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
<remove name="OPTIONSVerbHandler" />
<remove name="TRACEVerbHandler" />
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
</handlers></system.webServer>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
Expand All @@ -43,6 +48,26 @@
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.28.0" newVersion="2.2.28.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Humanizer" publicKeyToken="979442b78dfc278e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.0.0" newVersion="2.5.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
</configuration>
77 changes: 60 additions & 17 deletions src/TestStack.Seleno.AcceptanceTests.Web/packages.config
Original file line number Diff line number Diff line change
@@ -1,22 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="3.3.3" targetFramework="net40" />
<package id="ChameleonForms" version="1.0.0.42" targetFramework="net40" />
<package id="Humanizer" version="1.0" targetFramework="net40" />
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
<package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net40" />
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net40" />
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net40" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net40" />
<package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net40" />
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" />
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net40" />
<package id="Castle.Core" version="4.3.1" targetFramework="net471" />
<package id="ChameleonForms" version="3.0.2" targetFramework="net471" />
<package id="Humanizer" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.af" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.ar" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.bg" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.bn-BD" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.cs" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.da" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.de" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.el" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.es" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.fa" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.fi-FI" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.fr" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.fr-BE" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.he" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.hr" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.hu" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.id" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.it" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.ja" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.lv" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.ms-MY" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.mt" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.nb" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.nb-NO" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.nl" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.pl" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.pt" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.ro" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.ru" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.sk" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.sl" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.sr" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.sr-Latn" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.sv" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.tr" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.uk" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.uz-Cyrl-UZ" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.uz-Latn-UZ" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.vi" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.zh-CN" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.zh-Hans" version="2.5.16" targetFramework="net471" />
<package id="Humanizer.Core.zh-Hant" version="2.5.16" targetFramework="net471" />
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net471" />
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net471" />
<package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net471" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net471" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net471" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net471" />
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net471" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net471" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net471" />
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net471" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
<package id="Newtonsoft.Json" version="5.0.6" targetFramework="net40" />
<package id="NUnit" version="2.6.4" targetFramework="net40" />
<package id="Selenium.Support" version="2.53.0" targetFramework="net40" />
<package id="Selenium.WebDriver" version="2.53.0" targetFramework="net40" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net471" />
<package id="NUnit" version="3.11.0" targetFramework="net471" />
<package id="Selenium.Support" version="3.141.0" targetFramework="net471" />
<package id="Selenium.WebDriver" version="3.141.0" targetFramework="net471" />
<package id="WebActivator" version="1.5.3" targetFramework="net40" />
</packages>
14 changes: 11 additions & 3 deletions src/TestStack.Seleno.AcceptanceTests/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand All @@ -26,6 +26,14 @@
<assemblyIdentity name="NSubstitute" publicKeyToken="92dd2e9066daa5ca" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.7.2.0" newVersion="1.7.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Humanizer" publicKeyToken="979442b78dfc278e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.0.0" newVersion="2.5.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" /></startup></configuration>
Loading