From 2c03d167fae59668053d895f0400641d4eeb2916 Mon Sep 17 00:00:00 2001 From: Ed Sanders Date: Tue, 18 Jul 2017 14:02:42 +0100 Subject: build: Upgrade grunt-eslint from 19.0.0 to 20.0.0 Most indent and escaping fixes. Change-Id: I210e2fc3c0ce3148327ef81f824e1ce9f1e269b6 --- tests/selenium/wdio.conf.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'tests/selenium') diff --git a/tests/selenium/wdio.conf.js b/tests/selenium/wdio.conf.js index c8fb8a743533..f3e48777e11c 100644 --- a/tests/selenium/wdio.conf.js +++ b/tests/selenium/wdio.conf.js @@ -1,7 +1,6 @@ -/* eslint comma-dangle: 0 */ -/* eslint no-undef: "error" */ -/* eslint no-console: 0 */ /* eslint-env node */ +/* eslint no-undef: "error" */ +/* eslint-disable no-console, comma-dangle */ 'use strict'; const path = require( 'path' ); @@ -114,12 +113,12 @@ exports.config = { // with "/", then the base url gets prepended. baseUrl: ( process.env.MW_SERVER === undefined ? - 'http://127.0.0.1:8080' : - process.env.MW_SERVER + 'http://127.0.0.1:8080' : + process.env.MW_SERVER ) + ( process.env.MW_SCRIPT_PATH === undefined ? - '/w' : - process.env.MW_SCRIPT_PATH + '/w' : + process.env.MW_SCRIPT_PATH ), // // Default timeout for all waitFor* commands. -- cgit v1.2.3