From 4f3ec7874a902d914585392af4d090af4c938fef Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Tue, 12 Apr 2016 09:28:47 -0400 Subject: [PATCH] Change app name to twiddle --- app/services/ember-cli.js | 6 +++--- blueprints/mouse_events_initializer.js | 2 +- blueprints/router_initializer.js | 4 ++-- tests/unit/services/ember-cli-test.js | 14 +++++++------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/services/ember-cli.js b/app/services/ember-cli.js index c6e1382a..d42b6271 100644 --- a/app/services/ember-cli.js +++ b/app/services/ember-cli.js @@ -10,7 +10,7 @@ import _template from "lodash/string/template"; const hbsPlugin = new HtmlbarsInlinePrecompile(Ember.HTMLBars.precompile); const { computed, inject, RSVP } = Ember; -const twiddleAppName = 'app'; +const twiddleAppName = 'twiddle'; // These files will be included if not present const boilerPlateJs = [ @@ -323,7 +323,7 @@ export default Ember.Service.extend({
`; - testStuff += ``; + testStuff += ``; } return { depScriptTags, depCssLinkTags, testStuff }; @@ -352,7 +352,7 @@ export default Ember.Service.extend({ addConfig (out) { let config = { - modulePrefix: "app", + modulePrefix: twiddleAppName, TWIDDLE_ORIGIN: location.origin }; diff --git a/blueprints/mouse_events_initializer.js b/blueprints/mouse_events_initializer.js index 90cd3901..7f7d577b 100644 --- a/blueprints/mouse_events_initializer.js +++ b/blueprints/mouse_events_initializer.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -import config from 'app/config/environment'; +import config from '../config/environment'; export default { name: 'mouse-events', diff --git a/blueprints/router_initializer.js b/blueprints/router_initializer.js index 9664e4c8..69a1d4fc 100644 --- a/blueprints/router_initializer.js +++ b/blueprints/router_initializer.js @@ -1,6 +1,6 @@ -import Router from 'app/router'; +import Router from '../router'; import Ember from 'ember'; -import config from 'app/config/environment'; +import config from '../config/environment'; Router.reopen({ updateUrlBar: Ember.on('didTransition', function() { diff --git a/tests/unit/services/ember-cli-test.js b/tests/unit/services/ember-cli-test.js index 99399545..03cfb313 100644 --- a/tests/unit/services/ember-cli-test.js +++ b/tests/unit/services/ember-cli-test.js @@ -29,12 +29,12 @@ test('compiling a gist works', function(assert) { Ember.run(function() { service.compileGist(gist).then(function(output) { output = output.replace(/define\('([a-z0-9\-\/]+)'/gi,'define("$1"'); - assert.ok(output.indexOf('define("app/router"')>-1, 'build contains router'); - assert.ok(output.indexOf('define("app/initializers/router"')>-1, 'build contains router initializer'); - assert.ok(output.indexOf('define("app/app"')>-1, 'build contains app'); - assert.ok(output.indexOf('define("app/templates/application"')>-1, 'build contains template'); - assert.ok(output.indexOf('define("app/controllers/application"')>-1, 'build contains controller'); - assert.ok(output.indexOf('define("app/config/environment"')>-1, 'build contains config'); + assert.ok(output.indexOf('define("twiddle/router"')>-1, 'build contains router'); + assert.ok(output.indexOf('define("twiddle/initializers/router"')>-1, 'build contains router initializer'); + assert.ok(output.indexOf('define("twiddle/app"')>-1, 'build contains app'); + assert.ok(output.indexOf('define("twiddle/templates/application"')>-1, 'build contains template'); + assert.ok(output.indexOf('define("twiddle/controllers/application"')>-1, 'build contains controller'); + assert.ok(output.indexOf('define("twiddle/config/environment"')>-1, 'build contains config'); }); }); }); @@ -69,7 +69,7 @@ test('compileHbs includes moduleName', function(assert) { var service = this.subject(); var result = service.compileHbs('foo', 'somePath/here.hbs'); - assert.ok(result.indexOf('moduleName: "app/somePath/here"') > -1, 'moduleName included'); + assert.ok(result.indexOf('moduleName: "twiddle/somePath/here"') > -1, 'moduleName included'); }); test('compileHbs can include backticks', function(assert) {