Implemented for disable bttn in tag option also #1260

MetadataConsulting · May 14, 2018 · ceff71f · ceff71f
1 parent 95bcff8
commit ceff71f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/ModelCatalogueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/TagsPage.groovy b/ModelCatalogueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/TagsPage.groovy
@@ -28,11 +28,11 @@ class TagsPage extends Page {
  expandLink.click()
  }
 
- Boolean isDeleteBttnVisible() {
- if (deleteBttn.attr("class") == "disabled")
+ Boolean isDeleteBttnDissable() {
+ if (!deleteBttn || deleteBttn?.attr("class") == "disabled") {
  return true
- else
-  false
+ }
+ false
  }
 
  void dataElementDropDown() {

diff --git a/...nal/org/modelcatalogue/core/rolevisibility/AdminUserCannotDeleteFinalizedItemsSpec.groovy b/...nal/org/modelcatalogue/core/rolevisibility/AdminUserCannotDeleteFinalizedItemsSpec.groovy
@@ -1,6 +1,7 @@
 package org.modelcatalogue.core.rolevisibility
 
 import geb.spock.GebSpec
+import jdk.nashorn.internal.ir.annotations.Ignore
 import spock.lang.Issue
 import spock.lang.Narrative
 import spock.lang.Specification
@@ -417,6 +418,7 @@ class AdminUserCannotDeleteFinalizedItemsSpec extends GebSpec {
  dataClassesPage.isDeleteBttnDisable()
  }
 
+
  def "Check for delete disable in data elements"() {
  when:
  DataModelPage dataModelPage = browser.page DataModelPage
@@ -432,6 +434,7 @@ class AdminUserCannotDeleteFinalizedItemsSpec extends GebSpec {
  dataElementsPage.isDeleteBttnDisable()
  }
 
+
  def "Check for delete disable in data types"() {
  when:
  DataModelPage dataModelPage = browser.page DataModelPage
@@ -447,6 +450,7 @@ class AdminUserCannotDeleteFinalizedItemsSpec extends GebSpec {
  dataTypesPage.isDeleteBttnDisable()
  }
 
+
  def "Check for delete disable in measurement"() {
  when:
  DataModelPage dataModelPage = browser.page DataModelPage
@@ -476,4 +480,19 @@ class AdminUserCannotDeleteFinalizedItemsSpec extends GebSpec {
  then:
  businessRulesPage.isDeleteBttnDisable()
  }
+
+ def "Check for delete disable in tags"() {
+ when:
+ DataModelPage dataModelPage = browser.page DataModelPage
+ dataModelPage.treeView.select("Tags")
+ then:
+ at TagsPage
+
+ when:
+ TagsPage tagsPage = browser.page TagsPage
+ tagsPage.expandLinkClick()
+ tagsPage.dataElementDropDown()
+ then:
+ tagsPage.isDeleteBttnDissable()
+ }
 }