Implemented CuratorCannotCreateClassInFinalizedModelSpec #1258

MetadataConsulting · May 11, 2018 · 87b1c8f · 87b1c8f
1 parent 1edc160
commit 87b1c8f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 23 deletions.
diff --git a/...talogueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/DataModelPage.groovy b/...talogueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/DataModelPage.groovy
@@ -55,6 +55,10 @@ class DataModelPage extends Page {
         finalizedLink.click()
     }
 
+    Boolean isFinalizedDataModelVisible() {
+        return finalizedLink?.displayed
+    }
+
     void dropdown() {
         dropdownLink.click()
     }

diff --git a/...rg/modelcatalogue/core/rolevisibility/CuratorCannotCreateClassInFinalizedModelSpec.groovy b/...rg/modelcatalogue/core/rolevisibility/CuratorCannotCreateClassInFinalizedModelSpec.groovy
@@ -33,19 +33,19 @@ import spock.lang.*
 class CuratorCannotCreateClassInFinalizedModelSpec extends GebSpec {
 
     @Shared
-    String name="name30"+UUID.randomUUID().toString()
+    String name = "name30" + UUID.randomUUID().toString()
     @Shared
-    String modelCatalogueId=UUID.randomUUID().toString()
+    String modelCatalogueId = UUID.randomUUID().toString()
     @Shared
-    String description="description"
+    String description = "description"
     @Shared
-    String cwName="name"+UUID.randomUUID().toString()
+    String cwName = "name" + UUID.randomUUID().toString()
     @Shared
-    String cwModelCatalogueId=UUID.randomUUID().toString()
+    String cwModelCatalogueId = UUID.randomUUID().toString()
     @Shared
-    String cwDescription="description"
+    String cwDescription = "description"
     @Shared
-    String version="1.1"
+    String version = "1.1"
     @Shared
     String versionNote = "versionNote"
 
@@ -65,7 +65,6 @@ class CuratorCannotCreateClassInFinalizedModelSpec extends GebSpec {
         dashboardPage.nav.createDataModel()
         then:
         at CreateDataModelPage
-
     }
 
     def "Filling form"() {
@@ -77,8 +76,6 @@ class CuratorCannotCreateClassInFinalizedModelSpec extends GebSpec {
         createDataModelPage.submit()
         then:
         at DataModelPage
-
-
     }
 
     def "Select data class tag and fill data class wizard"() {
@@ -87,7 +84,6 @@ class CuratorCannotCreateClassInFinalizedModelSpec extends GebSpec {
         dataModelPage.treeView.select("Data Classes")
         then:
         DataClassesPage dataClassesPage = browser.page DataClassesPage
-        print("dataClassesPage.titleText()" + dataClassesPage.titleText())
         assert "Active Data Classes" == dataClassesPage.titleText().trim()
 
         when:
@@ -122,7 +118,7 @@ class CuratorCannotCreateClassInFinalizedModelSpec extends GebSpec {
 
         when:
         FinalizeDataModelPage finalizeDataModelPage = browser.page FinalizeDataModelPage
-//        finalizeDataModelPage.version = version
+        finalizeDataModelPage.version = version
         finalizeDataModelPage.setVersionNote(versionNote)
         finalizeDataModelPage.submit()
         then:
@@ -133,7 +129,6 @@ class CuratorCannotCreateClassInFinalizedModelSpec extends GebSpec {
         finalizedDataModelPage.hideConfirmation()
         then:
         at DataModelPage
-
     }
 
     def "Redirect to data class"() {
@@ -142,22 +137,13 @@ class CuratorCannotCreateClassInFinalizedModelSpec extends GebSpec {
         dataModelPage.treeView.select("Data Classes")
         then:
         DataClassesPage dataClassesPage = browser.page DataClassesPage
-        print("dataClassesPage.titleText()" + dataClassesPage.titleText())
         assert "Active Data Classes" == dataClassesPage.titleText().trim()
-
     }
 
     def "Checking for create button"() {
         when:
         DataClassesPage dataClassesPage = browser.page DataClassesPage
-        print"01"+dataClassesPage.isAddItemIconVisible()
-        then:
-        assert dataClassesPage.isAddItemIconVisible()==false
-
-        when:
-        DataModelPage dataModelPage = browser.page DataModelPage
-        print"1"+dataModelPage.treeView.checkItemDisplay("Data Classes")
         then:
-        assert dataModelPage.treeView.checkItemDisplay("Data Classes")==false
+        assert dataClassesPage.isAddItemIconVisible() == false
     }
 }