pin the reset fixtures to 2.11.1

so I don't have to keep updating them when I want to test a new ember-cli version

Author: Kelly Selden

test/acceptance/ember-cli-update-test.js

@@ -320,7 +320,8 @@ describe(function() {
       fixturesPath: 'test/fixtures/app/local',
       commitMessage: 'my-app',
       init: true,
-      reset: true
+      reset: true,
+      to: '2.11.1'
     })).promise;
 
     expect(path.join(tmpPath, 'config/ember-cli-update.json')).to.be.a.file()
@@ -420,7 +421,7 @@ describe(function() {
     let {
       status
     } = await (await merge({
-      fixturesPath: 'test/fixtures/app/merge',
+      fixturesPath: 'test/fixtures/app/local',
       commitMessage: 'my-app',
       bootstrap: true
     })).promise;
@@ -433,7 +434,7 @@ describe(function() {
     await fs.remove(path.join(tmpPath, 'config/ember-cli-update.json'));
 
     fixtureCompare({
-      mergeFixtures: 'test/fixtures/app/merge/my-app'
+      mergeFixtures: 'test/fixtures/app/local/my-app'
     });
   });
 

test/fixtures/app/reset/my-app/.bowerrc

@@ -0,0 +1,4 @@
+{
+  "directory": "bower_components",
+  "analytics": false
+}

test/fixtures/app/reset/my-app/.eslintignore

@@ -14,10 +14,4 @@
 /coverage/*
 /libpeerconnection.log
 npm-debug.log*
-yarn-error.log
 testem.log
-
-# ember-try
-.node_modules.ember-try/
-bower.json.ember-try
-package.json.ember-try

test/fixtures/app/reset/my-app/.eslintrc.js

@@ -0,0 +1,32 @@
+{
+  "predef": [
+    "document",
+    "window",
+    "-Promise"
+  ],
+  "browser": true,
+  "boss": true,
+  "curly": true,
+  "debug": false,
+  "devel": true,
+  "eqeqeq": true,
+  "evil": true,
+  "forin": false,
+  "immed": false,
+  "laxbreak": false,
+  "newcap": true,
+  "noarg": true,
+  "noempty": false,
+  "nonew": false,
+  "nomen": false,
+  "onevar": false,
+  "plusplus": false,
+  "regexp": false,
+  "undef": true,
+  "sub": true,
+  "strict": false,
+  "white": false,
+  "eqnull": true,
+  "esversion": 6,
+  "unused": true
+}

test/fixtures/app/reset/my-app/.gitignore

@@ -1,26 +1,24 @@
 ---
 language: node_js
 node_js:
-  - "6"
+  - "4"
 
 sudo: false
-dist: trusty
-
-addons:
-  chrome: stable
 
 cache:
   directories:
     - $HOME/.npm
-
-env:
-  global:
-    # See https://git.io/vdao3 for details.
-    - JOBS=1
+    - $HOME/.cache # includes bowers cache
 
 before_install:
   - npm config set spin false
+  - npm install -g bower phantomjs-prebuilt
+  - bower --version
+  - phantomjs --version
+
+install:
+  - npm install
+  - bower install
 
 script:
-  - npm run lint:js
   - npm test

test/fixtures/app/reset/my-app/.jshintrc

@@ -8,21 +8,22 @@ A short introduction of this app could easily go here.
 You will need the following things properly installed on your computer.
 
 * [Git](https://git-scm.com/)
-* [Node.js](https://nodejs.org/) (with npm)
+* [Node.js](https://nodejs.org/) (with NPM)
+* [Bower](https://bower.io/)
 * [Ember CLI](https://ember-cli.com/)
-* [Google Chrome](https://google.com/chrome/)
+* [PhantomJS](http://phantomjs.org/)
 
 ## Installation
 
 * `git clone <repository-url>` this repository
 * `cd my-app`
 * `npm install`
+* `bower install`
 
 ## Running / Development
 
 * `ember serve`
 * Visit your app at [http://localhost:4200](http://localhost:4200).
-* Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
 
 ### Code Generators
 
@@ -33,11 +34,6 @@ Make use of the many generators for code, try `ember help generate` for more det
 * `ember test`
 * `ember test --server`
 
-### Linting
-
-* `npm run lint:js`
-* `npm run lint:js -- --fix`
-
 ### Building
 
 * `ember build` (development)
@@ -49,7 +45,7 @@ Specify what it takes to deploy your app.
 
 ## Further Reading / Useful Links
 
-* [ember.js](https://emberjs.com/)
+* [ember.js](http://emberjs.com/)
 * [ember-cli](https://ember-cli.com/)
 * Development Browser Extensions
   * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)

test/fixtures/app/reset/my-app/.travis.yml

@@ -1,9 +1,13 @@
-import Application from '@ember/application';
+import Ember from 'ember';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-const App = Application.extend({
+let App;
+
+Ember.MODEL_FACTORY_INJECTIONS = true;
+
+App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver

test/fixtures/app/reset/my-app/README.md

@@ -9,8 +9,8 @@
 
     {{content-for "head"}}
 
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/my-app.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/my-app.css">
 
     {{content-for "head-footer"}}
   </head>