Merge pull request #491 from kellyselden/sinon

replace vendor/sinon with ember-sinon

README.md

@@ -20,7 +20,7 @@ Comprehensive animation support for ambitious Ember applications. [Interactive D
 
 - Backed by velocity.js, but easy to extend to other animation drivers
   if there's interest.
-  
+
 
 ## Ember Compatibility Table
 
@@ -38,7 +38,7 @@ welcome, but new feature work happens on `master`.
 
 ## Installation
 
-This is an ember-cli addon, so all you need is an npm install. 
+This is an ember-cli addon, so all you need is an npm install.
 For Ember 1.13 or newer, use:
 
     ember install liquid-fire
@@ -49,7 +49,7 @@ For older ember versions, consult the compatibility table above to pick the righ
     ember install liquid-fire@^0.19.0
 
 
-### Documentation 
+### Documentation
 
 [Liquid Fire website](http://ember-animation.github.io/liquid-fire) is an ember-cli application that contains an
 interactive demo & documentation. It runs from Liquid Fire's [test dummy app](https://github.com/ember-animation/liquid-fire/tree/master/tests/dummy/app).
@@ -71,6 +71,3 @@ addon format.
 ### Selecting Ember Versions
 
 Liquid Fire is tested against many versions of Ember using [ember-try](https://github.com/ember-cli/ember-try). The oldest supported version is listed in `versionCompatibility` in `package.json`, and in CI we test every minor release since then, through beta and canary.
-
-
-

ember-cli-build.js

@@ -13,7 +13,6 @@ module.exports = function(defaults) {
     }
   });
   app.import('bower_components/moment/moment.js');
-  app.import('vendor/sinon.js', { type: 'test'});
 
   if (!/^1\.[89]/.test(require('./bower_components/ember/bower.json').version)) {
     app.import('bower_components/ember/ember-template-compiler.js', { type: 'test' });

package.json

@@ -44,6 +44,7 @@
     "ember-code-snippet": "^1.0.0",
     "ember-load-initializers": "^0.5.0",
     "ember-resolver": "^2.0.3",
+    "ember-sinon": "^0.5.1",
     "git-repo-info": "^1.0.4",
     "github": "git://github.com/mikedeboer/node-github#ca90bf27d5820812c3b76908189d666446ed97cd",
     "loader.js": "^4.0.0",

tests/helpers/integration.js

@@ -1,5 +1,5 @@
-/* global sinon */
 import Ember from "ember";
+import sinon from 'sinon';
 
 function transitionMap(app) {
   return app.__container__.lookup('service:liquid-fire-transitions');

tests/integration/helpers/liquid-bind-block-form-test.js

@@ -1,6 +1,6 @@
-/* global sinon */
 import Ember from "ember";
 import { test, moduleForComponent } from "ember-qunit";
+import sinon from 'sinon';
 
 moduleForComponent('Integration: liquid-bind block form', {
   integration: true,

tests/integration/helpers/liquid-bind-test.js

@@ -1,6 +1,6 @@
-/* global sinon */
 import Ember from "ember";
 import { test, moduleForComponent } from "ember-qunit";
+import sinon from 'sinon';
 
 moduleForComponent('Integration: liquid-bind', {
   integration: true,

tests/integration/helpers/liquid-if-test.js

@@ -1,7 +1,7 @@
-/* global sinon */
 import Ember from "ember";
 import { skip } from 'qunit';
 import { test, moduleForComponent } from "ember-qunit";
+import sinon from 'sinon';
 
 moduleForComponent('Integration: liquid-if', {
   integration: true,

tests/integration/helpers/liquid-outlet-test.js

@@ -1,8 +1,8 @@
-/* global sinon */
 import Ember from "ember";
 import { skip } from 'qunit';
 import { test, moduleForComponent } from "ember-qunit";
 import { withTemplate } from "../../helpers/outlet";
+import sinon from 'sinon';
 
 var top, topState, controller, stageView;
 

tests/integration/helpers/liquid-spacer-test.js

@@ -1,7 +1,7 @@
-/* global sinon */
 import { test, moduleForComponent } from "ember-qunit";
 import { testingKick } from "liquid-fire/mutation-observer";
 import LiquidSpacer from "liquid-fire/components/liquid-spacer";
+import sinon from 'sinon';
 
 var tmap;