minor fixes (#1198)

MetadataConsulting · Apr 25, 2018 · beb871b · beb871b
1 parent d147b0f
commit beb871b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/...ginTestApp/test/functional/org/modelcatalogue/core/geb/CreateDataClassChildrenPage.groovy b/...ginTestApp/test/functional/org/modelcatalogue/core/geb/CreateDataClassChildrenPage.groovy
@@ -18,7 +18,7 @@ class CreateDataClassChildrenPage extends Page implements InputUtils, MetadataUt
 
         excludeDataElementCheckbox(required: true) { $('input', type: "checkbox", 2) }
         mergeToSingleSectionCheckbox(required: true) { $('input', type: "checkbox", 1) }
-        excludeCheckbox(required: true) { $('input.ng-pristine.ng-untouched.ng-valid', 0) }
+        excludeCheckbox(required: true) { $('input', type: "checkbox", 0) }
         labelTextArea { $("textarea#section-label") }
         sectionTextArea { $("textarea#section-title") }
         sectionSubtitleArea { $('textarea#section-subtitle') }
@@ -136,10 +136,7 @@ class CreateDataClassChildrenPage extends Page implements InputUtils, MetadataUt
     }
 
     boolean isEnabled(Navigator parent) {
-        if (parent.@disabled == "disabled") {
-            return false
-        }
-        return true
+        !(parent.@disabled == "disabled")
     }
 
 }
diff --git a/...ginTestApp/test/functional/org/modelcatalogue/core/geb/CreateDataClassFinishedPage.groovy b/...ginTestApp/test/functional/org/modelcatalogue/core/geb/CreateDataClassFinishedPage.groovy
@@ -7,7 +7,7 @@ class CreateDataClassFinishedPage extends Page implements InputUtils, MetadataUt
     static at = { $('.modal-dialog').text().contains('Data Class Wizard') }
 
     static content = {
-        createAnotherButton(wait: true) { $('button.btn.btn-success', 1) }
+        createAnotherButton(wait: true) { $('button.btn-success', 1) }
         exitButton(wait: true) { $('button#exit-wizard') }
     }
 

diff --git a/...uginTestApp/test/functional/org/modelcatalogue/core/geb/CreateDataClassParentsPage.groovy b/...uginTestApp/test/functional/org/modelcatalogue/core/geb/CreateDataClassParentsPage.groovy
@@ -135,10 +135,7 @@ class CreateDataClassParentsPage extends Page implements InputUtils, MetadataUti
     }
 
     boolean isEnabled(Navigator parent) {
-        if (parent.@disabled == "disabled") {
-            return false
-        }
-        return true
+        !(parent.@disabled == "disabled")
     }
 
 }