chenage variavles name CuratorCannotCreateClassInFinalizedModelSpec #…

…1258
MetadataConsulting · May 11, 2018 · 8d10a08 · 8d10a08
1 parent 87b1c8f
commit 8d10a08
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/...logueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/DataClassesPage.groovy b/...logueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/DataClassesPage.groovy
@@ -20,7 +20,7 @@ class DataClassesPage extends Page {
         }
         treeView { $('div.data-model-treeview-pane', 0).module(DataModelTreeViewModule) }
         rows { $('div.inf-table-body tbody tr') }
-        titlename { $('div.col-md-12 h3') }
+        titlename { $('div   h3') }
     }
 
     int count() {

diff --git a/...ePluginTestApp/test/functional/org/modelcatalogue/core/geb/DataModelTreeViewModule.groovy b/...ePluginTestApp/test/functional/org/modelcatalogue/core/geb/DataModelTreeViewModule.groovy
@@ -5,7 +5,7 @@ import geb.Module
 class DataModelTreeViewModule extends Module {
 
     static content = {
-        dataModelLink { int index -> $('a.catalogue-element-treeview-icon')[index] }
+        dataModelLink { int index -> $('a.catalogue-element-treeview-icon', index) }
         item { $('ul .catalogue-element-treeview-name', text: it) }
     }
 

diff --git a/...rg/modelcatalogue/core/rolevisibility/CuratorCannotCreateClassInFinalizedModelSpec.groovy b/...rg/modelcatalogue/core/rolevisibility/CuratorCannotCreateClassInFinalizedModelSpec.groovy
@@ -33,17 +33,17 @@ import spock.lang.*
 class CuratorCannotCreateClassInFinalizedModelSpec extends GebSpec {
 
     @Shared
-    String name = "name30" + UUID.randomUUID().toString()
+    String dataPageName = UUID.randomUUID().toString()
     @Shared
-    String modelCatalogueId = UUID.randomUUID().toString()
+    String dataPageId = UUID.randomUUID().toString()
     @Shared
-    String description = "description"
+    String dataPageDescription = "description"
     @Shared
-    String cwName = "name" + UUID.randomUUID().toString()
+    String dataClassName = UUID.randomUUID().toString()
     @Shared
-    String cwModelCatalogueId = UUID.randomUUID().toString()
+    String dataClassId = UUID.randomUUID().toString()
     @Shared
-    String cwDescription = "description"
+    String dataClassDescription = "description"
     @Shared
     String version = "1.1"
     @Shared
@@ -70,9 +70,9 @@ class CuratorCannotCreateClassInFinalizedModelSpec extends GebSpec {
     def "Filling form"() {
         when:
         CreateDataModelPage createDataModelPage = browser.page CreateDataModelPage
-        createDataModelPage.name = name
-        createDataModelPage.modelCatalogueId = modelCatalogueId
-        createDataModelPage.description = description
+        createDataModelPage.name = dataPageName
+        createDataModelPage.modelCatalogueId = dataPageId
+        createDataModelPage.description = dataPageDescription
         createDataModelPage.submit()
         then:
         at DataModelPage
@@ -93,9 +93,9 @@ class CuratorCannotCreateClassInFinalizedModelSpec extends GebSpec {
 
         when:
         CreateDataClassPage createDataClassPage = browser.page CreateDataClassPage
-        createDataClassPage.name = cwName
-        createDataClassPage.modelCatalogueId = cwModelCatalogueId
-        createDataClassPage.description = cwDescription
+        createDataClassPage.name = dataClassName
+        createDataClassPage.modelCatalogueId = dataClassId
+        createDataClassPage.description = dataClassDescription
         createDataClassPage.finish()
         createDataClassPage.exit()
         then:
@@ -144,6 +144,6 @@ class CuratorCannotCreateClassInFinalizedModelSpec extends GebSpec {
         when:
         DataClassesPage dataClassesPage = browser.page DataClassesPage
         then:
-        assert dataClassesPage.isAddItemIconVisible() == false
+        assert !dataClassesPage.isAddItemIconVisible()
     }
 }