Change if condition for delete bttn #1260

MetadataConsulting · May 14, 2018 · 73de12a · 73de12a
1 parent 4a50bc5
commit 73de12a
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 26 deletions.
diff --git a/...lCatalogueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/AssetsPage.groovy b/...lCatalogueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/AssetsPage.groovy
@@ -27,10 +27,7 @@ class AssetsPage extends Page {
  }
 
  Boolean isDeleteBttnDisable() {
- if (deleteBttn.attr("class") == "disabled")
- return true
- else
- false
+ deleteBttn.attr("class") == "disabled"
  }
 
  void dataElementDropDown() {

diff --git a/...gueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/BusinessRulesPage.groovy b/...gueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/BusinessRulesPage.groovy
@@ -27,10 +27,7 @@ class BusinessRulesPage extends Page {
  }
 
  Boolean isDeleteBttnDisable() {
- if (deleteBttn.attr("class") == "disabled")
- return true
- else
- false
+ deleteBttn.attr("class") == "disabled"
  }
 
  void dataElementDropDown() {

diff --git a/...logueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/DataClassesPage.groovy b/...logueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/DataClassesPage.groovy
@@ -31,10 +31,7 @@ class DataClassesPage extends Page {
  }
 
  Boolean isDeleteBttnDisable() {
- if (deleteBttn.attr("class") == "disabled")
- return true
- else
- false
+ deleteBttn.attr("class") == "disabled"
  }
 
  void dataElementDropDown() {

diff --git a/...ogueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/DataElementsPage.groovy b/...ogueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/DataElementsPage.groovy
@@ -35,10 +35,7 @@ class DataElementsPage extends Page {
  }
 
  Boolean isDeleteBttnDisable() {
- if (deleteBttn.attr("class") == "disabled")
- return true
- else
- false
+ deleteBttn.attr("class") == "disabled"
  }
 
  void dataElementDropDown() {

diff --git a/...talogueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/DataTypesPage.groovy b/...talogueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/DataTypesPage.groovy
@@ -28,10 +28,7 @@ class DataTypesPage extends Page {
  }
 
  Boolean isDeleteBttnDisable() {
- if (deleteBttn.attr("class") == "disabled")
- return true
- else
- false
+ deleteBttn.attr("class") == "disabled"
  }
 
  void dataElementDropDown() {

diff --git a/...CorePluginTestApp/test/functional/org/modelcatalogue/core/geb/MeasurementUnitsPage.groovy b/...CorePluginTestApp/test/functional/org/modelcatalogue/core/geb/MeasurementUnitsPage.groovy
@@ -27,10 +27,7 @@ class MeasurementUnitsPage extends Page {
  }
 
  Boolean isDeleteBttnDisable() {
- if (deleteBttn.attr("class") == "disabled")
- return true
- else
- false
+ deleteBttn.attr("class") == "disabled"
  }
 
  void dataElementDropDown() {

diff --git a/ModelCatalogueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/TagsPage.groovy b/ModelCatalogueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/TagsPage.groovy
@@ -29,10 +29,10 @@ class TagsPage extends Page {
  }
 
  Boolean isDeleteBttnDissable() {
- if (!deleteBttn || deleteBttn?.attr("class") == "disabled") {
+ if (!deleteBttn) {
  return true
  }
- false
+ return deleteBttn?.attr("class") == "disabled"
  }
 
  void dataElementDropDown() {