Merge pull request #1102 from ironmansoftware/1093

Fixes #1093, #1080
ironmansoftware · Sep 12, 2019 · 85f9b1a · 85f9b1a
2 parents 0540be3 + a2f6196
commit 85f9b1a
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 46 deletions.
diff --git a/src/UniversalDashboard.Materialize/Components/ud-input-field.jsx b/src/UniversalDashboard.Materialize/Components/ud-input-field.jsx
@@ -116,7 +116,7 @@ export default class UdInputField extends React.Component {
                 value={field.value} 
                 onBlur={e => this.onValidateField(field, e)} 
                 onKeyDown={this.onKeyDown.bind(this)}  
-                placeholder={field.placeholder ? field.placeholder[0] : field.name}
+                label={field.placeholder ? field.placeholder[0] : field.name}
             />
         }
 

diff --git a/src/UniversalDashboard.Materialize/package-lock.json b/src/UniversalDashboard.Materialize/package-lock.json
diff --git a/src/UniversalDashboard.Materialize/package.json b/src/UniversalDashboard.Materialize/package.json
@@ -24,7 +24,7 @@
     "react-debounce-input": "3.2.0",
     "react-grid-layout": "^0.16.6",
     "react-interval": "^2.0.1",
-    "react-materialize": "^3.3.0",
+    "react-materialize": "^3.4.1",
     "react-treebeard": "^2.1.0",
     "styled-components": "^4.2.0",
     "terminal-in-react": "^4.3.1"

diff --git a/src/UniversalDashboard.UITest/Integration/Input.Tests.ps1 b/src/UniversalDashboard.UITest/Integration/Input.Tests.ps1
@@ -14,6 +14,26 @@ $Driver = Start-SeFirefox
 
 Describe "Input" {
 
+    Context "textbox" {
+        $Dashboard = New-UDDashboard -Title "Test" -Content {
+            New-UDInput -Title "Simple Form" -Id "Form" -Content {
+                New-UDInputField -Type 'textbox' -Name 'DepartmentNumber' -Placeholder 'Department Number ("2600922")'
+            } -Endpoint {
+                param($DepartmentNumber)
+
+                $Cache:Data = $Test
+            }
+        }
+
+        $Server.DashboardService.SetDashboard($Dashboard)
+        Enter-SeUrl -Driver $Driver -Url "http://localhost:$BrowserPort"
+
+        It "should have helper text" {
+            $Element = Find-SeElement -TagName 'label' -Driver $Driver
+            $Element.Text | Should be 'Department Number ("2600922")'
+        }
+    }
+
     Context "grid in content" {
         $Dashboard = New-UDDashboard -Title "Test" -Content {
             New-UDInput -Title "Simple Form" -Id "Form" -Endpoint {
@@ -139,7 +159,8 @@ Describe "Input" {
             $Element = Find-SeElement -Id 'EmailAddress' -Driver $Driver
             Send-SeKeys -Element $Element -Keys 'a'
             $Element = Find-SeElement -Id 'SomeOtherField' -Driver $Driver
-            Invoke-SeClick -Element $Element 
+            Invoke-SeClick -Element $Element -JavaScriptClick -Driver $Driver
+            Send-SeKeys -Element $Element -Keys 'a'
 
             (Find-SeElement -ClassName 'fa-times-circle' -Driver $Driver) |  Get-SeElementAttribute -Attribute 'data-tooltip' | should be 'The email address you entered is invalid.'
         }
@@ -149,9 +170,12 @@ Describe "Input" {
             Enter-SeUrl -Driver $Driver -Url "http://localhost:$BrowserPort"
 
             $Element = Find-SeElement -Id 'SomeOtherField' -Driver $Driver
-            Invoke-SeClick -Element $Element 
+            Invoke-SeClick -Element $Element -JavaScriptClick -Driver $Driver
+            Send-SeKeys -Element $Element -Keys ''
+
             $Element = Find-SeElement -Id 'EmailAddress' -Driver $Driver
-            Invoke-SeClick -Element $Element 
+            Invoke-SeClick -Element $Element -JavaScriptClick -Driver $Driver
+            Send-SeKeys -Element $Element -Keys 'a'
 
             (Find-SeElement -ClassName 'fa-times-circle' -Driver $Driver) |  Get-SeElementAttribute -Attribute 'data-tooltip' | should be 'SomeOtherField is required.'
         }
@@ -415,7 +439,8 @@ Describe "Input" {
         }
 
         It "should have friendly label for textbox" {
-            Find-SeElement -Id "Textbox" -Driver $Driver | Get-SeElementAttribute -Attribute "placeholder" | Should be "My Textbox"
+            $Element = Find-SeElement -TagName "label" -Driver $Driver | Where-Object { $_.Text -eq 'My Textbox' }
+            $Element | Should not be $null
         }
 
         It "should have friendly label for checkbox" {