Skip to content

Commit

Permalink
trying ember-cli-fastboot - with canary relaease
Browse files Browse the repository at this point in the history
  • Loading branch information
cs3b committed Jan 20, 2016
1 parent b86011d commit f3398ae
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 30 deletions.
2 changes: 1 addition & 1 deletion app/user/model.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Ember from 'ember';
export default Model.extend({
username: attr('string'),
aboutMe: attr('string'),
joinedAt: attr('date'),
//joinedAt: attr('date'),

chirps: hasMany('chirps'),

Expand Down
3 changes: 1 addition & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "chirper",
"dependencies": {
"ember": "2.3.0",
"ember": "canary",
"ember-cli-shims": "0.1.0",
"ember-cli-test-loader": "0.2.2",
"ember-load-initializers": "0.1.7",
Expand All @@ -13,7 +13,6 @@
"Faker": "~3.0.0",
"moment": "^2.8.0",
"moment-timezone": "^0.5.0",
"sweetalert": "~1.1.3"
},
"resolutions": {
"ember": "2.2.0"
Expand Down
4 changes: 2 additions & 2 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ module.exports = function(defaults) {
// please specify an object with the list of modules as keys
// along with the exports of each module as its value.

app.import('bower_components/sweetalert/dist/sweetalert.min.js');
app.import('bower_components/sweetalert/dist/sweetalert.css');
// app.import('bower_components/sweetalert/dist/sweetalert.min.js');
// app.import('bower_components/sweetalert/dist/sweetalert.css');

return app.toTree();
};
2 changes: 1 addition & 1 deletion lib/ember-cli-mirage
Submodule ember-cli-mirage updated 133 files
8 changes: 8 additions & 0 deletions mirage/config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
export default function() {

// These comments are here to help you get started. Feel free to delete them.

/*
Config (with defaults).
Note: these only affect routes defined *after* them!
*/

// this.urlPrefix = ''; // make this `http://localhost:8080`, for example, if your API is on a different server
this.namespace = 'api';
// this.timing = 400; // delay for each request, automatically set to 0 during testing
Expand Down
10 changes: 0 additions & 10 deletions mirage/scenarios/default.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
export default function (server) {

/*
Seed your development database using your factories.
This data will not be loaded in your tests.
*/

let users = [
server.create('user'),
server.create('user'),
Expand All @@ -13,9 +8,4 @@ export default function (server) {
server.create('user', {followersIds: [4,3,2,1], followeesIds: [2,1]})
];
users.forEach((user) => server.createList('chirp', 5, {userId: user.id}));

//users.forEach(function (user) {
// let allExceptMe = users.filter(u => u !== user);
// user.update('userIds', allExceptMe.map((u) => u.id));
//})
}
5 changes: 3 additions & 2 deletions mirage/serializers/application.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import JsonApiSerializer from 'ember-cli-mirage/serializers/json-api-serializer';
import { JSONAPISerializer } from 'ember-cli-mirage';

export default JsonApiSerializer;
export default JSONAPISerializer.extend({
});
4 changes: 2 additions & 2 deletions mirage/serializers/chirp.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import JsonApiSerializer from 'ember-cli-mirage/serializers/json-api-serializer';
import { JSONAPISerializer } from 'ember-cli-mirage';

export default JsonApiSerializer.extend({
export default JSONAPISerializer.extend({
relationships: ['user']
});
7 changes: 4 additions & 3 deletions mirage/serializers/user.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import JsonApiSerializer from 'ember-cli-mirage/serializers/json-api-serializer';
import { JSONAPISerializer } from 'ember-cli-mirage';

export default JsonApiSerializer.extend({
relationships: ['chirps', 'followees', 'followers']
export default JSONAPISerializer.extend({
relationships: ['chirps', 'followees', 'followers'],
includes: ['users']
});
8 changes: 1 addition & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@
"devDependencies": {
"broccoli-asset-rev": "^2.2.0",
"ember-ajax": "0.7.1",
"ember-body-class": "0.3.8",
"ember-cli": "2.2.0-beta.6",
"ember-cli-app-version": "^1.0.0",
"ember-cli-babel": "^5.1.5",
"ember-cli-dependency-checker": "^1.2.0",
"ember-cli-fastboot": "git+https://github.com/tildeio/ember-cli-fastboot.git#059c0adb98c5928111cdb2b63afaf1373dc6e742",
"ember-cli-fastboot": "git+https://github.com/tildeio/ember-cli-fastboot.git#f98999a6be189406f54019bf80278b899ff26f6e",
"ember-cli-htmlbars": "^1.0.1",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-inject-live-reload": "^1.3.1",
Expand All @@ -45,10 +44,5 @@
"ember-moment": "5.0.2",
"ember-resolver": "^2.0.3",
"liquid-fire": "0.22.1"
},
"ember-addon": {
"paths": [
"lib/ember-cli-mirage"
]
}
}
1 change: 1 addition & 0 deletions tests/helpers/destroy-app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ import Ember from 'ember';

export default function destroyApp(application) {
Ember.run(application, 'destroy');
server.shutdown();
}

0 comments on commit f3398ae

Please sign in to comment.