From 5c18e89d271fd515eaa2cbd2fb393fe133fb0bbc Mon Sep 17 00:00:00 2001 From: dotnetCarpenter Date: Sat, 8 Oct 2016 17:18:25 -0200 Subject: [PATCH] halt dev of chrome base solution --- .config/chrome_linux.js | 42 ++++++++++++++++++++++++++ karma.conf.js => .config/karma.conf.js | 4 +-- {spec => .config}/pretest.js | 0 dist/svg.js | 2 +- package.json | 3 +- 5 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 .config/chrome_linux.js rename karma.conf.js => .config/karma.conf.js (97%) rename {spec => .config}/pretest.js (100%) diff --git a/.config/chrome_linux.js b/.config/chrome_linux.js new file mode 100644 index 0000000..5820a19 --- /dev/null +++ b/.config/chrome_linux.js @@ -0,0 +1,42 @@ +'use strict' + +if(process.platform === 'linux') { + const child_process = require('child_process') + const exec = child_process.exec + const execSync = bind2(child_process.execSync, { encoding: 'utf8' })//spawnSync + const browsers = ['google-chrome', 'chromium-browser'] + + const findBrowser = msg => { + console.log(msg) + const browserString = /\/(.*)$/ + const browser = msg.match(browserString) + console.log(browsers) + if(browsers[browser]) browsers[browser] = true + } + + const tryCompose = (f, parameter) => { + //FIXME: + const x = f.splice(0, 1)[0] + if(Array.isArray(f) && f.length > 0) return tryCompose(f, parameter) + // + + try { + return x(parameter) + } + catch(e) { + console.warn(e.message) + } + } + + tryCompose([findBrowser, execSync], 'which google-chrome') + //findBrowser(execSync('which chromium-browser')) + + if(browsers[0]) return + if(!browsers[0] && browsers[1]) exec('export CHROME_BIN=chromium-browser') + if(browsers.every(b => !b)) console.warn('You need to install either Chrome or Chromium to run the test suite.') + +} + +function bind2(f, bound) { + return (parameter) => f(parameter, bound) +} \ No newline at end of file diff --git a/karma.conf.js b/.config/karma.conf.js similarity index 97% rename from karma.conf.js rename to .config/karma.conf.js index e2ecc37..2a7dae4 100644 --- a/karma.conf.js +++ b/.config/karma.conf.js @@ -5,7 +5,7 @@ module.exports = function(config) { config.set({ // base path that will be used to resolve all patterns (eg. files, exclude) - basePath: '', + basePath: '../', // frameworks to use @@ -15,7 +15,7 @@ module.exports = function(config) { // list of files / patterns to load in the browser files: [ - 'spec/pretest.js', + '.config/pretest.js', { pattern: 'spec/fixture.css', included: false, diff --git a/spec/pretest.js b/.config/pretest.js similarity index 100% rename from spec/pretest.js rename to .config/pretest.js diff --git a/dist/svg.js b/dist/svg.js index 595da34..4cda13a 100644 --- a/dist/svg.js +++ b/dist/svg.js @@ -6,7 +6,7 @@ * @copyright Wout Fierens * @license MIT * -* BUILT: Tue Oct 04 2016 15:03:44 GMT+0200 (CEST) +* BUILT: Wed Oct 05 2016 15:27:51 GMT+0200 (CEST) */ (function(root, factory) { if (typeof define === 'function' && define.amd) { diff --git a/package.json b/package.json index 0158eae..cee6ee6 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,8 @@ "typings": "./svg.js.d.ts", "scripts": { "build": "gulp", - "test": "karma start karma.conf.js --single-run" + "pretest": "node .config/chrome_linux.js", + "test": "karma start .config/karma.conf.js --single-run" }, "devDependencies": { "del": "^2.2.0", -- 2.39.5