commit c728f612f93e06dc2eb273a23bc32650136bae35
author Joan Touzet <wohali@users.noreply.github.com> Thu May 31 23:47:24 2018 -0400
committer GitHub <noreply@github.com> Thu May 31 23:47:24 2018 -0400
tree 1d3a7fb64b18ab1c6bdfe5a0bb5c3a693ce73c09
parent daa39842d790d96ccc0ae69c37dcb8579c50365f

Use a supported CouchDB docker image for selenium tests (#1085)

* Use a supported CouchDB docker image
* Create required database beforeEach tests
* Check for status_code instead of error message

docker/dc.selenium.yml

diff --git a/docker/dc.selenium.yml b/docker/dc.selenium.yml
index 8ff182d..213d2c8 100644
--- a/docker/dc.selenium.yml
+++ b/docker/dc.selenium.yml
@@ -8,7 +8,9 @@
 
   couchdb:
     container_name: couchdb
-    image: couchdbdev/debian-8-dev
-    command: '--with-haproxy -a tester:testerpass -n 1'
+    image: apache/couchdb:latest
+    environment:
+      COUCHDB_USER: tester
+      COUCHDB_PASSWORD: testerpass
     ports:
       - "5984:5984"

test/nightwatch_tests/helpers/helpers.js

diff --git a/test/nightwatch_tests/helpers/helpers.js b/test/nightwatch_tests/helpers/helpers.js
index f0e4777..11fd534 100644
--- a/test/nightwatch_tests/helpers/helpers.js
+++ b/test/nightwatch_tests/helpers/helpers.js
@@ -13,16 +13,30 @@
 var nano = require('nano');
 var async = require('async');
 
+
 function getRandomInt(min, max) {
   return Math.floor(Math.random() * (max - min)) + min;
 }
 
 const dbName = 'fauxton-selenium-tests-' + getRandomInt(1, 20000);
 
+function createDatabase(nano, database) {
+  return new Promise(function (resolve, reject) {
+    nano.db.create(database, function (err) {
+
+      //Tolerate database already existing
+      if (err && err.status_code != 412)
+        reject(err);
+      else
+        resolve();
+    });
+  });
+}
+
 module.exports = {
   asyncHookTimeout: 20000,
   maxWaitTime: 30000,
-  testDatabaseName : dbName,
+  testDatabaseName: dbName,
 
   getNanoInstance: function (dbURL) {
     console.log('DBURL:', dbURL);
@@ -31,7 +45,7 @@
 
   beforeEach: function (browser, done) {
     var nano = module.exports.getNanoInstance(browser.globals.test_settings.db_url),
-        database = module.exports.testDatabaseName;
+      database = module.exports.testDatabaseName;
 
     console.log('nano setting up database', database);
 
@@ -43,17 +57,26 @@
       }
       // create a new database
       nano.db.create(database, function (err, body, header) {
-        if (err) {
-          console.log('Error in setting up ' + database, err.message);
+          if (err) {
+            console.log('Error in setting up ' + database, err.message);
+          }
+          const databaseToCreate = ["_users", "_replicator", "_global_changes"];
+          const promises = databaseToCreate.map(db => createDatabase(nano, db));
+
+          Promise.all(promises).then(function () {
+            done();
+          }).catch(function (err) {
+            console.log("Unable to create required databases:" + JSON.stringify(err));
+            done();
+          });
         }
-        done();
-      });
+      );
     });
   },
 
   afterEach: function (browser, done) {
     var nano = module.exports.getNanoInstance(browser.globals.test_settings.db_url),
-        database = module.exports.testDatabaseName;
+      database = module.exports.testDatabaseName;
 
     console.log('nano cleaning up', database);
     nano.db.destroy(database, function (err, header, body) {