Merge branch 'develop'

NYULibraries · Jun 18, 2019 · 1425c7a · 1425c7a
2 parents a64898a + b75d1cb
commit 1425c7a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "enm-search-application",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Vue.js/D3 search SPA for the DLTS Enhanced Networked Monographs website.",
   "author": "David <da70@nyu.edu>",
   "private": true,

diff --git a/tests/browser/conf/wdio.main.conf.js b/tests/browser/conf/wdio.main.conf.js
@@ -78,7 +78,15 @@ exports.config = {
     // and 30 processes will get spawned. The property handles how many capabilities
     // from the same test should run tests.
     //
-    maxInstances           : 8,
+    // NOTE: The above description of maxInstances from WebdriverIO does not appear to be correct.
+    // maxInstances seems to determine how many total browser instances can be open at once.
+    // If there are for example 9 test files and 2 capabilities (Firefox and Chrome, say) and
+    // maxInstances is set to 9, webdriverio will open 5 Chrome windows and 4 Firefox windows.
+    //
+    // Recently there's been a bit of test flake when using 4 or 8 maxInstances.
+    // In particular the 'united states of america' preview pane tests have been
+    // timing out.  For now keeping it at one Chrome and one Firefox instance.
+    maxInstances           : 2,
     //
     // If you have trouble getting all important capabilities together, check out the
     // Sauce Labs platform configurator - a great tool to configure your capabilities:

diff --git a/tests/browser/pageobjects/search.page.js b/tests/browser/pageobjects/search.page.js
@@ -28,7 +28,7 @@ class SearchPage extends Page {
     }
 
     get baseUrl() {
-        return browser.options.baseUrl;
+        return browser.config.baseUrl;
     }
 
     get googleAnalytics() {

diff --git a/tests/browser/tests/google-analytics.js b/tests/browser/tests/google-analytics.js
@@ -19,7 +19,7 @@ suite( 'Search form', function () {
             const googleAnalytics = SearchPage.googleAnalytics;
             let expectedGoogleAnalytics = [];
 
-            if ( browser.options.enmGoogleAnalytics ) {
+            if ( browser.config.enmGoogleAnalytics ) {
                 expectedGoogleAnalytics = [
                     '<script type="text/javascript" async="" src="https://www.google-analytics.com/analytics.js"></script>',
                     '<script async="" src="https://www.googletagmanager.com/gtag/js?id=UA-51495518-4"></script>',

diff --git a/tests/browser/util/index.js b/tests/browser/util/index.js
@@ -92,7 +92,7 @@ function getActualFilesDirectory( suiteNameArg ) {
 }
 
 function getBrowserName() {
-    return browser.options.capabilities.browserName;
+    return browser.config.capabilities.browserName;
 }
 
 function getDiffFilePath( suiteName, id ) {