feat(e2e): Correction to work on drone ci

phoenix741 · Jan 10, 2018 · d869e9b · d869e9b
1 parent 31e56b3
commit d869e9b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -1,5 +1,17 @@
 pipeline:
-    test:
+    e2e:
+        group: test
+        image: node:8
+        commands:
+            - npm install
+            - npm run e2e:docker
+        environment:
+            - MONGODB_HOST=mongodb://mongodb:27017/passprotect
+            - MONGODB_DATABASE=passprotect
+            - HOST=e2e
+
+    unit:
+        group: test
         image: node:8
         commands:
             - wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add -
@@ -8,21 +20,20 @@ pipeline:
 
             - npm install
             - npm run unit
-            - npm run e2e:docker
-        environment:
-            - MONGODB_HOST=mongodb://mongodb:27017/passprotect
-            - MONGODB_DATABASE=passprotect
-            - HOST=test
 
     nodejs:
+        group: build
         image: plugins/docker
         repo: phoenix741/passprotect-server
+        secrets: [ docker_username, docker_password ]
         tags: develop
         dockerfile: Dockerfile.nodejs
 
     nginx:
+        group: build
         image: plugins/docker
         repo: phoenix741/passprotect-client
+        secrets: [ docker_username, docker_password ]
         tags: develop
         dockerfile: Dockerfile.nginx
 

diff --git a/docker-compose-selenium.yml b/docker-compose-selenium.yml
@@ -1,14 +1,14 @@
 version: '2'
 services:
-    test:
+    e2e:
         image: node:8
         command: /bin/bash
         volumes:
             - ./:/src
         environment:
             - MONGODB_HOST=mongodb://mongodb:27017/passprotect
             - MONGODB_DATABASE=passprotect
-            - HOST=test
+            - HOST=e2e
         stdin_open: true
         tty: true
 

diff --git a/test/e2e/nightwatch.docker.conf.js b/test/e2e/nightwatch.docker.conf.js
@@ -14,7 +14,7 @@ module.exports = _.merge({}, nightwatch, {
       selenium_host: 'selenium',
       silent: true,
       globals: {
-        devServerURL: 'http://test:' + (process.env.PORT || config.dev.port)
+        devServerURL: 'http://e2e:' + (process.env.PORT || config.dev.port)
       }
     }
   }

diff --git a/test/e2e/pages/ItemsPage.js b/test/e2e/pages/ItemsPage.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const WAIT_TIMEOUT = 5000
+const WAIT_TIMEOUT = 20000
 
 module.exports = {
   elements: {
@@ -78,6 +78,8 @@ module.exports = {
 
     assertItem (indice, title, type) {
       this
+        .waitForElementPresent(`#items-list > li:nth-child(${indice}) .line-title`, WAIT_TIMEOUT)
+
         .assert.containsText(`#items-list > li:nth-child(${indice}) .line-title`, title)
         .assert.containsText(`#items-list > li:nth-child(${indice}) .line-type`, type)
       return this.api
@@ -86,8 +88,9 @@ module.exports = {
     assertItemWithGroup (indice, group, title, type) {
       this
         .waitForElementVisible('@search', WAIT_TIMEOUT)
+        .waitForElementPresent(`#items-list > li:nth-child(${indice}).subheader`, WAIT_TIMEOUT)
 
-        .assert.containsText(`#items-list > li:nth-child(${indice})`, group)
+        .assert.containsText(`#items-list > li:nth-child(${indice}).subheader`, group)
         .assertItem(indice + 1, title, type)
       return this.api
     },