Merge pull request #631 from fippo/fix-karma

KaptenJansson · web-flow · commit 938f2317017b · 2017-07-20T10:18:30.000+02:00
test: fix karma config
diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -42,11 +42,11 @@ if (os.platform() === 'darwin' && process.env.BVER === 'unstable' &&
 }
 
 if (!process.env.FIREFOX_BIN) {
-  process.env.FIREFOX_BIN = os.cwd() + '/browsers/bin/firefox-'
+  process.env.FIREFOX_BIN = process.cwd() + '/browsers/bin/firefox-'
       + (process.env.BVER || 'stable');
 }
 if (!process.env.CHROME_BIN) {
-  process.env.CHROME_BIN = os.cwd() + '/browsers/bin/chrome-'
+  process.env.CHROME_BIN = process.cwd() + '/browsers/bin/chrome-'
       + (process.env.BVER || 'stable');
 }
 

Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,11 @@ if (os.platform() === 'darwin' && process.env.BVER === 'unstable' &&`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`if (!process.env.FIREFOX_BIN) {`
`45`		`- process.env.FIREFOX_BIN = os.cwd() + '/browsers/bin/firefox-'`
	`45`	`+ process.env.FIREFOX_BIN = process.cwd() + '/browsers/bin/firefox-'`
`46`	`46`	`+ (process.env.BVER \|\| 'stable');`
`47`	`47`	`}`
`48`	`48`	`if (!process.env.CHROME_BIN) {`
`49`		`- process.env.CHROME_BIN = os.cwd() + '/browsers/bin/chrome-'`
	`49`	`+ process.env.CHROME_BIN = process.cwd() + '/browsers/bin/chrome-'`
`50`	`50`	`+ (process.env.BVER \|\| 'stable');`
`51`	`51`	`}`
`52`	`52`