Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/services/ember-cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -323,7 +323,7 @@ export default Ember.Service.extend({
</div>
<div id="test-root"></div>`;

testStuff += `<script type="text/javascript">require("app/tests/test-helper");</script>`;
testStuff += `<script type="text/javascript">require("${twiddleAppName}/tests/test-helper");</script>`;
}

return { depScriptTags, depCssLinkTags, testStuff };
Expand Down Expand Up @@ -352,7 +352,7 @@ export default Ember.Service.extend({

addConfig (out) {
let config = {
modulePrefix: "app",
modulePrefix: twiddleAppName,
TWIDDLE_ORIGIN: location.origin
};

Expand Down
2 changes: 1 addition & 1 deletion blueprints/mouse_events_initializer.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Ember from 'ember';
import config from 'app/config/environment';
import config from '../config/environment';

export default {
name: 'mouse-events',
Expand Down
4 changes: 2 additions & 2 deletions blueprints/router_initializer.js
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
14 changes: 7 additions & 7 deletions tests/unit/services/ember-cli-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
});
});
});
Expand Down Expand Up @@ -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) {
Expand Down