Tabs tests (#671)

* Introduce faster component testing feature. Tabs tests. * Fix import.
ironmansoftware · Mar 1, 2019 · 4c4ecf0 · 4c4ecf0
1 parent e1e6213
commit 4c4ecf0
Show file tree

Hide file tree

Showing 13 changed files with 68 additions and 10 deletions.
diff --git a/...UITest/Integration/Selenium/Selenium.psm1 → src/Selenium/Selenium.psm1 b/...UITest/Integration/Selenium/Selenium.psm1 → src/Selenium/Selenium.psm1
diff --git a/...t/Integration/Selenium/Selenium.tests.ps1 → src/Selenium/Selenium.tests.ps1 b/...t/Integration/Selenium/Selenium.tests.ps1 → src/Selenium/Selenium.tests.ps1
diff --git a/...ntegration/Selenium/WebDriver.Support.dll → src/Selenium/WebDriver.Support.dll b/...ntegration/Selenium/WebDriver.Support.dll → src/Selenium/WebDriver.Support.dll
diff --git a/...UITest/Integration/Selenium/WebDriver.dll → src/Selenium/WebDriver.dll b/...UITest/Integration/Selenium/WebDriver.dll → src/Selenium/WebDriver.dll
diff --git a/...est/Integration/Selenium/chromedriver.exe → src/Selenium/chromedriver.exe b/...est/Integration/Selenium/chromedriver.exe → src/Selenium/chromedriver.exe
diff --git a/...Test/Integration/Selenium/geckodriver.exe → src/Selenium/geckodriver.exe b/...Test/Integration/Selenium/geckodriver.exe → src/Selenium/geckodriver.exe
diff --git a/src/UniversalDashboard.Materialize/Tests/driver.ps1 b/src/UniversalDashboard.Materialize/Tests/driver.ps1
@@ -0,0 +1,37 @@
+param(
+    [Switch]$NoClose
+)
+
+Import-Module (Join-Path $PSScriptRoot "../../Selenium/Selenium.psm1") -Force
+#Don't auto-load the materialize from UD
+$Global:UDNoMaterialize = $true
+Import-Module (Join-Path $PSScriptRoot "../../output/UniversalDashboard.Community.psd1") -Force 
+Import-Module (Join-Path $PSScriptRoot "../output/UniversalDashboard.Materialize/UniversalDashboard.Materialize.psd1") -Force
+
+$Tests = Get-ChildItem $PSScriptRoot -Filter "*.tests.ps1"
+
+$Dashboard = New-UDDashboard -Title "Test" -Content {}
+$Server = Start-UDDashboard -Port 10000 -Dashboard $Dashboard
+$Driver = Start-SeFirefox
+Enter-SeUrl -Url "http://localhost:10000" -Driver $Driver
+function Set-TestDashboard {
+    param(
+        [ScriptBlock]$Content
+    )
+
+    $Global:StateDictionary = @{}
+
+    $Dashboard = New-UDDashboard -Content $Content -Title "TEST" -EndpointInitialization (New-UDEndpointInitialization -Variable "StateDictionary")
+    $Server.DashboardService.SetDashboard($Dashboard)
+    Enter-SeUrl -Url "http://localhost:10000" -Driver $Driver
+}
+
+$Tests | ForEach-Object {
+    . $_.FullName
+}
+
+if (-not $NoClose) 
+{
+    Stop-UDDashboard -Port 10000
+    Stop-SeDriver $Driver
+}
diff --git a/src/UniversalDashboard.Materialize/Tests/tabs.tests.ps1 b/src/UniversalDashboard.Materialize/Tests/tabs.tests.ps1
@@ -0,0 +1,14 @@
+Describe "New-UDTabContainer" {
+    Context "Tabs" {
+        Set-TestDashboard {
+            New-UDTabContainer -Tabs {
+                New-UDTab -Text "Tab1" -Content { New-UDCard -Title "Hi" -Content {} }
+                New-UDTab -Text "Tab2" -Content { New-UDCard -Title "Hi2" -Content {} }
+            }
+        } 
+
+        It "has tabs" {
+            Find-SeElement -Driver $Driver -ClassName "tabs" | should not be $null
+        }
+    }
+}
diff --git a/src/UniversalDashboard.UITest/TestFramework.psm1 b/src/UniversalDashboard.UITest/TestFramework.psm1
@@ -1,4 +1,4 @@
-Import-Module "$PSScriptRoot\Integration\Selenium\Selenium.psm1" -Force 
+Import-Module "$PSScriptRoot\..\Selenium\Selenium.psm1" -Force 
 
 function Get-ModulePath {
     param([Switch]$Release)

diff --git a/src/UniversalDashboard/Server/Server.cs b/src/UniversalDashboard/Server/Server.cs
@@ -69,6 +69,8 @@ public Server(string name, string fileName, bool autoReload, PSHost host, int po
 		public bool Running { get; private set; }
 
 		internal bool IsRestApi { get; private set; }
+
+		public IDashboardService DashboardService { get; private set; }
 
 		private string _reloadKey;
 
@@ -88,8 +90,8 @@ public void Start(DashboardOptions dashboardOptions)
 			var builder = new WebHostBuilder()
 				.ConfigureServices((y) =>
 				{
-					var dashboardService = new DashboardService(dashboardOptions, _reloadKey);
-					y.Add(new ServiceDescriptor(typeof(IDashboardService), dashboardService));
+					DashboardService = new DashboardService(dashboardOptions, _reloadKey);
+					y.Add(new ServiceDescriptor(typeof(IDashboardService), DashboardService));
 
 					if (_reloader != null)
 						y.Add(new ServiceDescriptor(typeof(AutoReloader), _reloader));

diff --git a/src/UniversalDashboard/UniversalDashboard.psm1 b/src/UniversalDashboard/UniversalDashboard.psm1
@@ -12,4 +12,8 @@ if ($PSEdition -eq "Core") {
 
 Import-Module (Join-Path $PSScriptRoot "UniversalDashboardServer.psm1")
 Import-Module (Join-Path $PSScriptRoot "UniversalDashboard.Controls.psm1")
-Import-Module (Join-Path $PSScriptRoot "Modules\UniversalDashboard.Materialize\UniversalDashboard.Materialize.psd1")
+
+if (-not $Global:UDNoMaterialize)
+{
+	Import-Module (Join-Path $PSScriptRoot "Modules\UniversalDashboard.Materialize\UniversalDashboard.Materialize.psd1")
+}
diff --git a/src/build.ps1 b/src/build.ps1
@@ -97,5 +97,6 @@ if (-not $NoHelp) {
 
 if ($Test) {
 	. "$PSScriptRoot\UniversalDashboard.UITest\shebang.tests.ps1" -Release
+	. "$PSScriptRoot\UniversalDashboard.Materialize\driver.ps1"
 }
 
diff --git a/src/client/package-lock.json b/src/client/package-lock.json