From 38588947d031e7046ad52618b4320ccc3a8dd636 Mon Sep 17 00:00:00 2001 From: Tim Lancina Date: Mon, 20 Jul 2015 17:43:40 -0500 Subject: [PATCH] relative root path for e2e tests --- config.js | 18 ------------------ scripts/e2e/e2e.template.html | 2 +- scripts/resources/config.js | 8 ++++++++ scripts/resources/e2e.config.js | 8 ++++++++ 4 files changed, 17 insertions(+), 19 deletions(-) delete mode 100644 config.js create mode 100644 scripts/resources/config.js create mode 100644 scripts/resources/e2e.config.js diff --git a/config.js b/config.js deleted file mode 100644 index 614ba69383..0000000000 --- a/config.js +++ /dev/null @@ -1,18 +0,0 @@ -System.config({ - "baseURL": "/", - "transpiler": "traceur", - "paths": { - "*": "*.js", - "github:*": "jspm_packages/github/*.js", - "npm:*": "jspm_packages/npm/*.js", - "ionic/*": "ionic/*" - } -}); - -System.config({ - "map": { - "traceur": "github:jmcriffey/bower-traceur@0.0.88", - "traceur-runtime": "github:jmcriffey/bower-traceur-runtime@0.0.88" - } -}); - diff --git a/scripts/e2e/e2e.template.html b/scripts/e2e/e2e.template.html index a03a7319ec..da0cede9af 100644 --- a/scripts/e2e/e2e.template.html +++ b/scripts/e2e/e2e.template.html @@ -44,7 +44,7 @@ - + diff --git a/scripts/resources/config.js b/scripts/resources/config.js new file mode 100644 index 0000000000..f2cca3c2b7 --- /dev/null +++ b/scripts/resources/config.js @@ -0,0 +1,8 @@ +System.config({ + "baseURL": "/", + "transpiler": "traceur", + "paths": { + "*": "*.js", + "ionic/*": "ionic/*" + } +}); diff --git a/scripts/resources/e2e.config.js b/scripts/resources/e2e.config.js new file mode 100644 index 0000000000..a16dd562c0 --- /dev/null +++ b/scripts/resources/e2e.config.js @@ -0,0 +1,8 @@ +System.config({ + "baseURL": "../../../", + "transpiler": "traceur", + "paths": { + "*": "*.js", + "ionic/*": "ionic/*" + } +});