From 1c24ab4c01369e2aac394f3685c3311ac98f9b99 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paulschneider@free.fr>
Date: Mon, 5 Apr 2021 00:11:54 +0100
Subject: [PATCH] all

---
 .gitlab-ci.yml                          |  8 ++++++++
 src/test/Mandatory/ServerSideFixture.cs | 23 +++++++++++++++++++----
 src/test/NonRegression/AbstractTests.cs |  2 +-
 src/test/NonRegression/Database.cs      |  2 +-
 src/test/NonRegression/EMailling.cs     |  2 +-
 src/test/NonRegression/NodeTests.cs     |  2 +-
 src/test/Startup.cs                     |  4 ++++
 7 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f23b771a..6018e22d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,3 +52,11 @@ release:
     - make packages
 
 
+deploy_staging:
+  stage: deploy
+  script:
+    - echo "Deploy to staging server"
+  environment:
+    name: staging
+    url: https://yavscpre.pschneider.fr
+    
diff --git a/src/test/Mandatory/ServerSideFixture.cs b/src/test/Mandatory/ServerSideFixture.cs
index 7814b8f7..97c3c38f 100644
--- a/src/test/Mandatory/ServerSideFixture.cs
+++ b/src/test/Mandatory/ServerSideFixture.cs
@@ -16,7 +16,7 @@ using Microsoft.Data.Entity.Metadata.Conventions;
 
 namespace test
 {
-    [Trait("regres", "no")]
+    [Trait("regression", "II")]
     public class ServerSideFixture : IDisposable
     {
         SiteSettings _siteSetup;
@@ -99,27 +99,42 @@ namespace test
         private readonly IHostingEngine hostengnine;
 
 
-
+        void AssertNotNull(object obj, string msg)
+        {
+            if (obj == null)
+                throw new Exception(msg);
+        }
+        
         // 
         public ServerSideFixture()
         {
              host = new WebHostBuilder();
+            AssertNotNull(host, nameof(host));
 
             hostengnine = host
             .UseEnvironment("Development")
-            .UseServer("test")
+            .UseServer("test")  
             .UseStartup<test.Startup>()
             .Build();
+            
+            AssertNotNull(hostengnine, nameof(hostengnine));
 
             App = hostengnine.Start();
+            
+            AssertNotNull(App, nameof(App));
 
             //  hostengnine.ApplicationServices
 
             _mailer = App.Services.GetService(typeof(EMailer)) as EMailer;
+            AssertNotNull(_mailer, nameof(_mailer));
+            MailSender = App.Services.GetService(typeof(IEmailSender)) as IEmailSender;
+            AssertNotNull(MailSender, nameof(MailSender));
+
             _loggerFactory = App.Services.GetService(typeof(ILoggerFactory)) as ILoggerFactory;
+            AssertNotNull(_loggerFactory, nameof(_loggerFactory));
             var siteSetup = App.Services.GetService(typeof(IOptions<SiteSettings>)) as IOptions<SiteSettings>;
+            AssertNotNull(siteSetup, nameof(siteSetup));
             var testingSetup = App.Services.GetService(typeof(IOptions<Testing>)) as IOptions<Testing>;
-            MailSender = App.Services.GetService(typeof(IEmailSender)) as IEmailSender;
             DbContext = App.Services.GetService(typeof(ApplicationDbContext)) as ApplicationDbContext;
 
             SiteSetup = siteSetup.Value;
diff --git a/src/test/NonRegression/AbstractTests.cs b/src/test/NonRegression/AbstractTests.cs
index 36dd27cb..ce288f4b 100644
--- a/src/test/NonRegression/AbstractTests.cs
+++ b/src/test/NonRegression/AbstractTests.cs
@@ -6,7 +6,7 @@ using Yavsc.Helpers;
 namespace test
 {
     [Collection("Yavsc Abstract tests")]
-    [Trait("regression", "non")]
+    [Trait("regression", "II")]
     public class AbstractTests
     {
         readonly ITestOutputHelper output;
diff --git a/src/test/NonRegression/Database.cs b/src/test/NonRegression/Database.cs
index 21de12fd..b8557237 100644
--- a/src/test/NonRegression/Database.cs
+++ b/src/test/NonRegression/Database.cs
@@ -5,7 +5,7 @@ using Xunit.Abstractions;
 namespace test.Mandatory
 {
     [Collection("Database")]
-    [Trait("regression", "non")]
+    [Trait("regression", "II")]
     [Trait("dev", "wip")]
     public class Database: IClassFixture<ServerSideFixture>, IDisposable
     {
diff --git a/src/test/NonRegression/EMailling.cs b/src/test/NonRegression/EMailling.cs
index 799502c4..851fac47 100644
--- a/src/test/NonRegression/EMailling.cs
+++ b/src/test/NonRegression/EMailling.cs
@@ -7,7 +7,7 @@ namespace test
 {
 
     [Collection("EMaillingTeststCollection")]
-    [Trait("regression", "non")]
+    [Trait("regression", "II")]
     public class EMaillingTests : IClassFixture<ServerSideFixture>
 
     {
diff --git a/src/test/NonRegression/NodeTests.cs b/src/test/NonRegression/NodeTests.cs
index 0a1d236b..adb7bfd5 100755
--- a/src/test/NonRegression/NodeTests.cs
+++ b/src/test/NonRegression/NodeTests.cs
@@ -10,7 +10,7 @@ namespace test
     /// Since node isn't any requirement by here,
     /// It may regress
     /// </summary>
-    [Trait("regression", "oui")]
+    [Trait("regression", "allways")]
     public class NodeTests
     {
         void TestNodeJsForAnsitohtml ()
diff --git a/src/test/Startup.cs b/src/test/Startup.cs
index bb30177a..08400a74 100644
--- a/src/test/Startup.cs
+++ b/src/test/Startup.cs
@@ -47,6 +47,7 @@ using Microsoft.AspNet.DataProtection.Infrastructure;
 using System.IO;
 using Microsoft.AspNet.Identity.EntityFramework;
 using Yavsc.Auth;
+using Yavsc.Lib;
 
 namespace test
 {
@@ -114,7 +115,10 @@ namespace test
             services.AddEntityFramework().AddNpgsql().AddDbContext<ApplicationDbContext>();
             services.AddTransient((s) => new RazorTemplateEngine(s.GetService<RazorEngineHost>()));
             services.AddLogging();
+            services.AddTransient<ServerSideFixture>();
             services.AddTransient<MailSender>();
+            services.AddTransient<EMailer>();
+            
             services.AddLocalization(options =>
             {
                 options.ResourcesPath = "Resources";