minor fix maxoccursshowsinhistory(#1237)

MetadataConsulting · May 3, 2018 · 25d7276 · 25d7276
1 parent f099f83
commit 25d7276
Show file tree

Hide file tree

Showing 9 changed files with 227 additions and 12 deletions.
diff --git a/...tApp/test/functional/org/modelcatalogue/core/dataclass/MaxOccursShowsInHistorySpec.groovy b/...tApp/test/functional/org/modelcatalogue/core/dataclass/MaxOccursShowsInHistorySpec.groovy
@@ -53,12 +53,6 @@ class MaxOccursShowsInHistorySpec extends GebSpec {
         loginPage.login("curator", "curator")
         then:
         at DashboardPage
-
-        /*when: "delete this one"
-        DashboardPage dashboardPage = browser.page DashboardPage
-        dashboardPage.select("TESTING_MODEL")
-        then:
-        at DataModelPage*/
     }
 
     def "create a data model"() {
@@ -70,7 +64,7 @@ class MaxOccursShowsInHistorySpec extends GebSpec {
 
         when:
         CreateDataModelPage createDataModelPage = browser.page CreateDataModelPage
-        createDataModelPage.name = "TESTING_MODEL"
+        createDataModelPage.name = "TESTING_MODEL_ONE"
         createDataModelPage.description = "TESTING_MODEL_DESCRIPTION"
         createDataModelPage.modelCatalogueIdInput = "KDJFKD9349"
         createDataModelPage.submit()
@@ -81,7 +75,7 @@ class MaxOccursShowsInHistorySpec extends GebSpec {
     def "create data type"() {
         when:
         DataModelPage dataModelPage = browser.page DataModelPage
-        dataModelPage.treeView.select("Data Types")
+        dataModelPage.treeView.dataTypes()
         then:
         at DataTypesPage
 
@@ -93,7 +87,7 @@ class MaxOccursShowsInHistorySpec extends GebSpec {
 
         when:
         CreateDataTypePage createDataTypePage = browser.page CreateDataTypePage
-        createDataTypePage.name = "TESTING_DATATYPE_TWO"
+        createDataTypePage.name = "TESTING_DATATYPE"
         createDataTypePage.description = "TESTING_DESCRIPTION"
         createDataTypePage.buttons.save()
         then:
@@ -103,7 +97,7 @@ class MaxOccursShowsInHistorySpec extends GebSpec {
     def "create data element"() {
         when:
         DataTypesPage dataTypesPage = browser.page DataTypesPage
-        dataTypesPage.treeView.select("Data Elements")
+        dataTypesPage.treeView.dataElements()
         then:
         at DataElementsPage
 
@@ -137,7 +131,7 @@ class MaxOccursShowsInHistorySpec extends GebSpec {
     def "create data class"() {
         when:
         DataElementsPage dataElementsPage = browser.page DataElementsPage
-        dataElementsPage.treeView.select("Data Classes")
+        dataElementsPage.treeView.dataClasses()
         then:
         at DataClassesPage
 
@@ -169,7 +163,92 @@ class MaxOccursShowsInHistorySpec extends GebSpec {
         DataClassesPage dataClassesPage = browser.page DataClassesPage
         dataClassesPage.findByName("TESTING_CLASS")
         then:
-        true
+        at DataClassPage
+    }
+
+    def "select create relationship option"() {
+        when:
+        DataClassPage dataClassPage = browser.page DataClassPage
+        dataClassPage.selectDataClassDropdown()
+        then:
+        at DataClassPage
+
+        when:
+        dataClassPage = browser.page DataClassPage
+        dataClassPage.selectCreateRelationship()
+        then:
+        at CreateRelationshipPage
+
+        when:
+        CreateRelationshipPage createRelationshipPage = browser.page CreateRelationshipPage
+        createRelationshipPage.selectRelationshipType("parent of")
+        createRelationshipPage.searchMore()
+        then:
+        at SearchDataClassPage
+    }
+
+    def "create relationship"() {
+        when:
+        SearchDataClassPage searchDataClassPage = browser.page SearchDataClassPage
+        searchDataClassPage.addImport()
+        then:
+        at AddDataModelImportPage
+
+        when:
+        AddDataModelImportPage addDataModelImportPage = browser.page AddDataModelImportPage
+        addDataModelImportPage.searchMore()
+        then:
+        at SearchDataModelPage
+
+        when:
+        SearchDataModelPage searchDataModelPage = browser.page SearchDataModelPage
+        searchDataModelPage.searchDataModel("Cancer Model")
+        then:
+        at AddDataModelImportPage
+
+        when:
+        addDataModelImportPage = browser.page AddDataModelImportPage
+        addDataModelImportPage.importDataModel()
+        then:
+        at SearchDataClassPage
+
+        when:
+        searchDataClassPage = browser.page SearchDataClassPage
+        searchDataClassPage.searchDataClass("Cancer Model")
+        then:
+        at CreateRelationshipPage
+    }
+
+    def "finish creating relationship"() {
+        when:
+        CreateRelationshipPage createRelationshipPage = browser.page CreateRelationshipPage
+        createRelationshipPage.openMetadata()
+        then:
+        at CreateRelationshipPage
+
+        when:
+        createRelationshipPage = browser.page CreateRelationshipPage
+        createRelationshipPage.openOccuranceNavigator()
+        createRelationshipPage.maxOccurance = 10
+        then:
+        at CreateRelationshipPage
+
+        when:
+        createRelationshipPage = browser.page CreateRelationshipPage
+        createRelationshipPage.createRelationship()
+        driver.navigate().refresh()
+        then:
+        at DataClassPage
+    }
+
+    def "verify created relationship is show in history section"() {
+        when:
+        DataClassPage dataClassPage = browser.page DataClassPage
+
+        String text = dataClassPage.historyChange(0)
+        then:
+        assert text.contains("Cancer Model")
+        assert text.contains("Max Occurs")
     }
 
 }
diff --git a/...rePluginTestApp/test/functional/org/modelcatalogue/core/geb/AddDataModelImportPage.groovy b/...rePluginTestApp/test/functional/org/modelcatalogue/core/geb/AddDataModelImportPage.groovy
@@ -0,0 +1,22 @@
+package org.modelcatalogue.core.geb
+
+import geb.Page
+
+class AddDataModelImportPage extends Page implements InputUtils {
+    static at = { $("div.modal-header>h4")*.text().join(",").contains('Add Data Model Import') }
+
+    static content = {
+        searchMoreButton { $('span.search-for-more-icon', 0) }
+        searchBar { $('input#elements') }
+        okButton { $('button', text: "OK") }
+        cancelButton { $('button', text: "Cancel") }
+    }
+
+    void searchMore() {
+        searchMoreButton.click()
+    }
+
+    void importDataModel() {
+        okButton.click()
+    }
+}
diff --git a/...eCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/CreateDataClassPage.groovy b/...eCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/CreateDataClassPage.groovy
@@ -121,6 +121,7 @@ class CreateDataClassPage extends Page implements InputUtils, MetadataUtils {
 
     void exit() {
         exitButton.click()
+        sleep(1000)
     }
 
     void setName(String value) {

diff --git a/...eCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/CreateDataModelPage.groovy b/...eCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/CreateDataModelPage.groovy
@@ -26,6 +26,7 @@ class CreateDataModelPage extends Page implements InputUtils {
 
     void submit() {
         submitButton.click()
+        sleep(2000)
     }
 
     void check(String name) {

diff --git a/...rePluginTestApp/test/functional/org/modelcatalogue/core/geb/CreateRelationshipPage.groovy b/...rePluginTestApp/test/functional/org/modelcatalogue/core/geb/CreateRelationshipPage.groovy
@@ -0,0 +1,47 @@
+package org.modelcatalogue.core.geb
+
+import geb.Page
+
+class CreateRelationshipPage extends Page {
+    static at = { $("select#type", 0).displayed }
+
+    static content = {
+        relationshipTypeLink { $('select#type') }
+        relationshipTypeDropdown { $('select#type option', text: it) }
+        searchMoreButton { $('span.search-for-more-icon') }
+        metadataDropdown { $('label.expand-metadata span') }
+        metadataSideNavigator(wait: true) { $('div.mc-metadata-editor div', 0).$('ul li') }
+        metadataInputFeildsNavigator { $('div.mc-metadata-editor div', 1) }
+        maxOccurance(wait: true) { $('input#maxOccurs') }
+        createRelationshipButton { $('button.btn-primary', text: 'Create Relationship') }
+    }
+
+    void relationship() {
+        relationshipTypeLink.click()
+    }
+
+    void selectRelationshipType(String value) {
+        relationshipTypeDropdown(value).click()
+    }
+
+    void searchMore() {
+        searchMoreButton.click()
+    }
+
+    void openMetadata() {
+        metadataDropdown.click()
+    }
+
+    void openOccuranceNavigator() {
+        metadataSideNavigator.$('a', text: "Occurrence").click()
+    }
+
+    void setMaxOccurance(Integer value) {
+        maxOccurance.value(value)
+    }
+
+    void createRelationship() {
+        createRelationshipButton.click()
+        sleep(1000)
+    }
+}
diff --git a/...talogueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/DataClassPage.groovy b/...talogueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/DataClassPage.groovy
@@ -16,6 +16,9 @@ class DataClassPage extends Page {
         formMetadataLink { $('span.btn.btn-link btn-sm ng-binding') }
         tabs { $('ul.nav.nav-tabs a', text: it) }
         parentAddButton { $('span.fa.fa-plus-circle') }
+        dataClassMenu { $('#role_item_catalogue-element-menu-item-link') }
+        dataClassMenuDropdown { $('#role_item_catalogue-element-menu-item ul.dropdown-menu li') }
+        historyList(required: false, wait: true) { $('div#history-changes tbody tr') }
     }
 
     void edit() {
@@ -42,4 +45,16 @@ class DataClassPage extends Page {
         parentAddButton[2].click()
     }
 
+    void selectDataClassDropdown() {
+        dataClassMenu.click()
+    }
+
+    void selectCreateRelationship() {
+        $('a#create-new-relationship-menu-item-link').click()
+    }
+
+    String historyChange(int row) {
+        historyList[row].$('td', 3).text()
+    }
+
 }
diff --git a/...gueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/ModalFooterModule.groovy b/...gueCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/ModalFooterModule.groovy
@@ -13,11 +13,13 @@ class ModalFooterModule extends Module {
     void cancel() {
         cancelLink.click()
     }
+
     void saveAndCreateAnother() {
         saveAndCreateAnotherLink.click()
     }
 
     void save() {
         saveLink.click()
+        sleep(2000)
     }
 }
diff --git a/...eCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/SearchDataClassPage.groovy b/...eCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/SearchDataClassPage.groovy
@@ -0,0 +1,27 @@
+package org.modelcatalogue.core.geb
+
+import geb.Page
+
+class SearchDataClassPage extends Page implements InputUtils {
+    static at = { $("input#value", 0).displayed }
+
+    static content = {
+        search(wait: true) { $("input#value", 0) }
+        searchDataClassLink(wait: true) { $("h4.list-group-item-heading", text: contains(it)) }
+        addImportLink { $('a', text: 'Add Import') }
+    }
+
+    void selectDataClass(String name) {
+        searchDataClassLink(name).click()
+    }
+
+    void addImport() {
+        addImportLink.click()
+    }
+
+    void searchDataClass(String value) {
+        fillInput(search, value)
+        sleep(2000)
+        selectDataClass(value)
+    }
+}
diff --git a/...eCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/SearchDataModelPage.groovy b/...eCorePluginTestApp/test/functional/org/modelcatalogue/core/geb/SearchDataModelPage.groovy
@@ -0,0 +1,21 @@
+package org.modelcatalogue.core.geb
+
+import geb.Page
+
+class SearchDataModelPage extends Page implements InputUtils {
+    static at = { $("input#value", 0).displayed }
+
+    static content = {
+        searchBar(wait: true) { $("input#value", 0) }
+        searchDataModelLink(wait: true) { $("h4.list-group-item-heading", text: contains(it)) }
+        addImportLink { $('a', text: 'Add Import', 0) }
+    }
+
+    void searchDataModel(String name) {
+        searchDataModelLink(name).click()
+    }
+
+    void addImport() {
+        addImportLink.click()
+    }
+}