Skip to content

Commit f4e7993

Browse files
authored
Merge pull request #228 from code0100fun/chase-mirage-1-1-0
Upgrade to ember-cli-mirage ^1.1.0
2 parents 2f6c41d + 9423e2b commit f4e7993

15 files changed

Lines changed: 3521 additions & 153 deletions

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: node_js
33
node_js:
44
# we recommend testing addons with the same minimum supported node version as Ember CLI
55
# so that your addon works for all apps
6-
- "6"
6+
- "8"
77

88
dist: trusty
99

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import Inflector from 'ember-inflector';
2+
3+
export function initialize() {
4+
const inflector = Inflector.inflector;
5+
inflector.uncountable('githubRepositoryContents');
6+
}
7+
8+
export default {
9+
name: 'github-inflector-rules',
10+
initialize
11+
};
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default } from 'ember-data-github/initializers/github-inflector-rules';

config/ember-try.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ module.exports = function() {
1515
name: 'ember-lts-2.12',
1616
npm: {
1717
devDependencies: {
18-
'ember-source': '~2.12.0'
18+
'ember-source': '~2.12.0',
19+
'ember-data': '>=3.0.0 <=3.12'
1920
}
2021
}
2122
},

config/environment.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
'use strict';
22

33
module.exports = function(/* environment, appConfig */) {
4-
return { };
4+
return {
5+
'ember-cli-mirage': {
6+
trackRequests: true
7+
}
8+
};
59
};

mirage-support/factories/github-commit.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Factory, faker } from 'ember-cli-mirage';
1+
import { Factory } from 'ember-cli-mirage';
2+
import faker from 'faker';
23

34
export default Factory.extend({
45
id() {

mirage-support/factories/github-compare.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Factory, faker } from 'ember-cli-mirage';
1+
import { Factory } from 'ember-cli-mirage';
2+
import faker from 'faker';
23

34
export default Factory.extend({
45
ahead_by: faker.random.number(),

mirage-support/factories/github-file.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Factory, faker } from 'ember-cli-mirage';
1+
import { Factory } from 'ember-cli-mirage';
2+
import faker from 'faker';
23

34
export default Factory.extend({
45
id() {

mirage-support/factories/github-pull.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Factory, faker } from 'ember-cli-mirage';
1+
import { Factory } from 'ember-cli-mirage';
2+
import faker from 'faker';
23

34
export default Factory.extend({
45
number: faker.random.number(),

mirage-support/factories/github-release.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Factory, faker } from 'ember-cli-mirage';
1+
import { Factory } from 'ember-cli-mirage';
2+
import faker from 'faker';
23

34
export default Factory.extend({
45
tag_name: function(i) {

0 commit comments

Comments
 (0)