diff --git a/.travis.yml b/.travis.yml
index 533cb0e0..a009a47d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,8 @@ install:
- cd ../OAuth.AspNet.AuthServer && dnu restore --ignore-failed-sources
- cd ../Yavsc.Abstract && dnu restore --ignore-failed-sources
- cd ../Yavsc.Server && dnu restore --ignore-failed-sources
-- cd ../Yavsc && dnu restore --ignore-failed-sources
+- cd ../yavsc && dnu restore --ignore-failed-sources
+- cd ../test && dnu restore --ignore-failed-sources
script:
- "dnu build"
diff --git a/src/Yavsc.Abstract/Resources/Yavsc.Models.IT.Fixing.Bug.Designer.cs b/src/Yavsc.Abstract/Resources/Yavsc.Abstract.Resources.Bug.Designer.cs
similarity index 81%
rename from src/Yavsc.Abstract/Resources/Yavsc.Models.IT.Fixing.Bug.Designer.cs
rename to src/Yavsc.Abstract/Resources/Yavsc.Abstract.Resources.Bug.Designer.cs
index 6022902b..4583bb86 100644
--- a/src/Yavsc.Abstract/Resources/Yavsc.Models.IT.Fixing.Bug.Designer.cs
+++ b/src/Yavsc.Abstract/Resources/Yavsc.Abstract.Resources.Bug.Designer.cs
@@ -1,12 +1,12 @@
-// ------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Mono Runtime Version: 4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-// ------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
namespace Yavsc.Models.IT.Fixing {
using System;
diff --git a/src/Yavsc.Abstract/Resources/Yavsc.Models.Messaging.Resources.Designer.cs b/src/Yavsc.Abstract/Resources/Yavsc.Abstract.Resources.Resources.Designer.cs
similarity index 80%
rename from src/Yavsc.Abstract/Resources/Yavsc.Models.Messaging.Resources.Designer.cs
rename to src/Yavsc.Abstract/Resources/Yavsc.Abstract.Resources.Resources.Designer.cs
index afe973c5..c4fbcc6e 100644
--- a/src/Yavsc.Abstract/Resources/Yavsc.Models.Messaging.Resources.Designer.cs
+++ b/src/Yavsc.Abstract/Resources/Yavsc.Abstract.Resources.Resources.Designer.cs
@@ -1,12 +1,12 @@
-// ------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Mono Runtime Version: 4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-// ------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
namespace Yavsc.Models.Messaging {
using System;
diff --git a/src/Yavsc.Server/Resources/Yavsc.Models.Relationship.HyperLink.Designer.cs b/src/Yavsc.Server/Resources/Yavsc.Server.Resources.HyperLink.Designer.cs
similarity index 84%
rename from src/Yavsc.Server/Resources/Yavsc.Models.Relationship.HyperLink.Designer.cs
rename to src/Yavsc.Server/Resources/Yavsc.Server.Resources.HyperLink.Designer.cs
index 5bae0726..ba871857 100644
--- a/src/Yavsc.Server/Resources/Yavsc.Models.Relationship.HyperLink.Designer.cs
+++ b/src/Yavsc.Server/Resources/Yavsc.Server.Resources.HyperLink.Designer.cs
@@ -1,12 +1,12 @@
-// ------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Mono Runtime Version: 4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-// ------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
namespace Yavsc.Models.Relationship {
using System;
diff --git a/src/Yavsc/Resources/Yavsc.ViewComponents.CommentViewComponent.Designer.cs b/src/Yavsc/Resources/Yavsc.Resources.CommentViewComponent.Designer.cs
similarity index 87%
rename from src/Yavsc/Resources/Yavsc.ViewComponents.CommentViewComponent.Designer.cs
rename to src/Yavsc/Resources/Yavsc.Resources.CommentViewComponent.Designer.cs
index 7c8d5810..f62f8775 100644
--- a/src/Yavsc/Resources/Yavsc.ViewComponents.CommentViewComponent.Designer.cs
+++ b/src/Yavsc/Resources/Yavsc.Resources.CommentViewComponent.Designer.cs
@@ -1,12 +1,12 @@
-// ------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Mono Runtime Version: 4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-// ------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
namespace Yavsc.ViewComponents {
using System;
diff --git a/src/Yavsc/Resources/Yavsc.ViewModels.EnrolerViewModel.Designer.cs b/src/Yavsc/Resources/Yavsc.Resources.EnrolerViewModel.Designer.cs
similarity index 81%
rename from src/Yavsc/Resources/Yavsc.ViewModels.EnrolerViewModel.Designer.cs
rename to src/Yavsc/Resources/Yavsc.Resources.EnrolerViewModel.Designer.cs
index a765b326..b5fd2404 100644
--- a/src/Yavsc/Resources/Yavsc.ViewModels.EnrolerViewModel.Designer.cs
+++ b/src/Yavsc/Resources/Yavsc.Resources.EnrolerViewModel.Designer.cs
@@ -1,12 +1,12 @@
-// ------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Mono Runtime Version: 4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-// ------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
namespace Yavsc.ViewModels {
using System;
diff --git a/src/Yavsc/Resources/Yavsc.ViewModels.FrontOffice.PerformerProfileViewModel.Designer.cs b/src/Yavsc/Resources/Yavsc.Resources.PerformerProfileViewModel.Designer.cs
similarity index 80%
rename from src/Yavsc/Resources/Yavsc.ViewModels.FrontOffice.PerformerProfileViewModel.Designer.cs
rename to src/Yavsc/Resources/Yavsc.Resources.PerformerProfileViewModel.Designer.cs
index b9560d06..511dbf5b 100644
--- a/src/Yavsc/Resources/Yavsc.ViewModels.FrontOffice.PerformerProfileViewModel.Designer.cs
+++ b/src/Yavsc/Resources/Yavsc.Resources.PerformerProfileViewModel.Designer.cs
@@ -1,12 +1,12 @@
-// ------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Mono Runtime Version: 4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-// ------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
namespace Yavsc.ViewModels.FrontOffice {
using System;
diff --git a/src/Yavsc/Resources/Yavsc.Models.IT.Fixing.Resources.Designer.cs b/src/Yavsc/Resources/Yavsc.Resources.Resources.Designer.cs
similarity index 100%
rename from src/Yavsc/Resources/Yavsc.Models.IT.Fixing.Resources.Designer.cs
rename to src/Yavsc/Resources/Yavsc.Resources.Resources.Designer.cs
diff --git a/src/Yavsc/Resources/YavscLocalisation.Designer.cs b/src/Yavsc/Resources/Yavsc.Resources.YavscLocalisation.Designer.cs
similarity index 100%
rename from src/Yavsc/Resources/YavscLocalisation.Designer.cs
rename to src/Yavsc/Resources/Yavsc.Resources.YavscLocalisation.Designer.cs
diff --git a/src/test/Mandatory/RegisterApi.cs b/src/test/Mandatory/RegisterApi.cs
new file mode 100644
index 00000000..dec1e96c
--- /dev/null
+++ b/src/test/Mandatory/RegisterApi.cs
@@ -0,0 +1,46 @@
+// // YavscWorkInProgress.cs
+// /*
+// paul 21/06/2018 10:11 20182018 6 21
+// */
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNet.Hosting;
+using Microsoft.Extensions.PlatformAbstractions;
+using Xunit;
+using Xunit.Abstractions;
+using Yavsc.Authentication;
+using static OAuth.AspNet.AuthServer.Constants;
+using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Razor;
+
+namespace test
+{
+ [Collection("Yavsc Work In Progress")]
+ [Trait("regres", "yes")]
+ [Trait("module", "api")]
+ public class RegiserAPI : BaseTestContext, IClassFixture
+ {
+ public RegiserAPI(ServerSideFixture serverFixture, ITestOutputHelper output)
+ : base(output, serverFixture)
+ {
+
+ }
+
+ [Fact]
+ public void EnsureWeb()
+ {
+ var host = new WebHostBuilder();
+ host.UseEnvironment("Development")
+ .UseServer("Microsoft.AspNet.Server.Kestrel")
+ .UseStartup()
+ .Build().Start();
+ }
+
+ }
+}
diff --git a/src/test/Mandatory/Remoting.cs b/src/test/Mandatory/Remoting.cs
index 0f181c7c..65f753fe 100644
--- a/src/test/Mandatory/Remoting.cs
+++ b/src/test/Mandatory/Remoting.cs
@@ -22,10 +22,12 @@ namespace test
[Trait("regres", "yes")]
public class Remoting : BaseTestContext, IClassFixture
{
+ RegiserAPI r;
public Remoting(ServerSideFixture serverFixture, ITestOutputHelper output)
: base(output, serverFixture)
{
+ r = new RegiserAPI(serverFixture, output);
}
[Theory]
@@ -44,6 +46,8 @@ namespace test
{
try
{
+ r.EnsureWeb();
+
var oauthor = new OAuthenticator(clientId, clientSecret, scope,
new Uri(authorizeUrl), new Uri(redirectUrl), new Uri(accessTokenUrl));
var query = new Dictionary
@@ -52,7 +56,6 @@ namespace test
[Parameters.Password] = Startup.Testing.ValidCreds[0].Password,
[Parameters.GrantType] = GrantTypes.Password
};
- EnsureWeb();
var result = await oauthor.RequestAccessTokenAsync(query);
Console.WriteLine(">> Got an output");
@@ -76,24 +79,7 @@ namespace test
throw;
}
}
- internal static void EnsureWeb()
- {
- throw new NotImplementedException();
-
- DirectoryInfo di = new DirectoryInfo("../Yavsc");
- Environment.CurrentDirectory = di.FullName;
- var host = new WebHostBuilder();
-
- var hostengine = host
-
- .UseEnvironment("Development")
-
- .UseServer("Microsoft.AspNet.Server.Kestrel")
- .UseStartup()
- .Build();
-// hostengine.ApplicationServices
- var startup = hostengine.Start();
- }
+
public static IEnumerable