Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Closes softlayer/sl-ember-components#77 #106

Merged
merged 2 commits into from
Dec 7, 2014
Merged

Closes softlayer/sl-ember-components#77 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2497d2
Closes softlayer/sl-ember-components#77
notmessenger Dec 7, 2014
4c70589
Merge develop branch
notmessenger Dec 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ember-cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": true
"disableAnalytics": false
}
1 change: 1 addition & 0 deletions Brocfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* jshint node: true */
/* global require, module, process */

var EmberAddon = require('ember-cli/lib/broccoli/ember-addon'),
Expand Down
4 changes: 2 additions & 2 deletions package.json
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
"broccoli-static-compiler": "^0.2.1"
},
"devDependencies": {
"broccoli-asset-rev": "1.0.0",
"broccoli-asset-rev": "^1.0.0",
"broccoli-ember-hbs-template-compiler": "^1.6.1",
"ember-cli": "^0.1.3",
"ember-cli": "0.1.4",
"ember-cli-dependency-checker": "0.0.6",
"ember-cli-esnext": "0.1.1",
"ember-cli-ic-ajax": "0.1.1",
Expand Down
4 changes: 4 additions & 0 deletions tests/dummy/app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@

<link rel="stylesheet" href="assets/vendor.css">
<link rel="stylesheet" href="assets/sl-ember-components.css">

{{content-for 'head-footer'}}
</head>
<body>
{{content-for 'body'}}

<script src="assets/vendor.js"></script>
<script src="assets/dummy.js"></script>

{{content-for 'body-footer'}}
</body>
</html>
2 changes: 1 addition & 1 deletion tests/dummy/config/environment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module.exports = function(environment) {
if (environment === 'test') {
// Testem prefers this...
ENV.baseURL = '/';
ENV.locationType = 'auto';
ENV.locationType = 'none';

// keep test console output quieter
ENV.APP.LOG_ACTIVE_GENERATION = false;
Expand Down
6 changes: 0 additions & 6 deletions tests/helpers/start-app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,12 @@ export default function startApp(attrs) {
var attributes = Ember.merge({}, config.APP);
attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;

Router.reopen({
location: 'none'
});

Ember.run(function() {
App = Application.create(attributes);
App.setupForTesting();
slregisterTestHelpers();
App.injectTestHelpers();
});

App.reset(); // this shouldn't be needed, i want to be able to "start an app at a specific URL"

return App;
}
8 changes: 6 additions & 2 deletions tests/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
zoom: 50%;
}
</style>

{{content-for 'head-footer'}}
{{content-for 'test-head-footer'}}
</head>
<body>

Expand All @@ -38,9 +41,10 @@
<script src="assets/vendor.js"></script>
<script src="assets/test-support.js"></script>
<script src="assets/dummy.js"></script>
<script src="assets/sinon.js"></script>
<script src="assets/sinon-qunit.js"></script>
<script src="testem.js"></script>
<script src="assets/test-loader.js"></script>

{{content-for 'body-footer'}}
{{content-for 'test-body-footer'}}
</body>
</html>