From 0d775c421280446fa068377cdf5630f99a9d10e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gast=C3=B3n=20I=2E=20Silva?= <givanse@gmail.com>
Date: Sun, 12 Jul 2015 12:20:24 -0500
Subject: [PATCH 01/10] use each as block and remove bind-attr

---
 packages/storefront/README.md                 | 23 +++++++++++++++++++
 .../components/spree-breadcrumbs.hbs          |  4 ++--
 .../templates/components/spree-checkout.hbs   |  6 ++---
 .../addon/templates/components/spree-grid.hbs |  2 +-
 .../templates/components/spree-images.hbs     |  8 +++----
 .../templates/components/spree-lineitems.hbs  |  4 ++--
 .../addon/templates/components/spree-pdp.hbs  |  2 +-
 .../templates/components/spree-properties.hbs |  4 ++--
 .../templates/components/spree-select.hbs     |  9 ++++----
 .../templates/components/spree-shipment.hbs   |  6 ++---
 .../templates/components/spree-taxonomies.hbs |  4 ++--
 .../templates/components/spree-taxonomy.hbs   |  2 +-
 .../app/templates/spree/checkout.hbs          |  2 +-
 packages/storefront/config/ember-try.js       | 18 +++++++++++++++
 packages/storefront/package.json              |  1 -
 packages/storefront/tests/.jshintrc           |  1 +
 packages/storefront/tests/test-helper.js      |  2 ++
 17 files changed, 70 insertions(+), 28 deletions(-)

diff --git a/packages/storefront/README.md b/packages/storefront/README.md
index ca46900..29dd216 100644
--- a/packages/storefront/README.md
+++ b/packages/storefront/README.md
@@ -62,3 +62,26 @@ var app = new EmberApp({
 });
 ```
 
+## Testing 
+
+```bash
+npm install
+bower install
+# current Ember version
+ember test
+# all supported Ember versions
+ember test
+```
+
+## Contributing 
+
+In the addon folder
+```bash
+npm link
+```
+
+In your project folder
+```bash
+npm link spree-ember-storefront
+ember generate spree-ember-storefront
+```
diff --git a/packages/storefront/addon/templates/components/spree-breadcrumbs.hbs b/packages/storefront/addon/templates/components/spree-breadcrumbs.hbs
index 681cff9..ed921ee 100644
--- a/packages/storefront/addon/templates/components/spree-breadcrumbs.hbs
+++ b/packages/storefront/addon/templates/components/spree-breadcrumbs.hbs
@@ -1,6 +1,6 @@
 <ul class="breadcrumbs">
-  {{#each step in steps}}
-    <li {{bind-attr class=step.status}}>
+  {{#each steps as |step|}}
+    <li class="{{step.status}}">
       <a {{action 'clickedCrumb' step}}>{{step.name}}</a>
     </li>
   {{/each}}
diff --git a/packages/storefront/addon/templates/components/spree-checkout.hbs b/packages/storefront/addon/templates/components/spree-checkout.hbs
index 5a063d8..c28dc1e 100644
--- a/packages/storefront/addon/templates/components/spree-checkout.hbs
+++ b/packages/storefront/addon/templates/components/spree-checkout.hbs
@@ -6,7 +6,7 @@ It's structured like this to demonstrate the style of reactive programming that
 the Stateful Checkout service is designed for.  It's also here to show the 
 apprpriate hooks and data sets available on the Checkouts service.
 -->
-<form {{bind-attr class="spree.checkouts.currentState"}}>
+<form class="{{spree.checkouts.currentState}}">
   <fieldset>
     <legend style="text-transform:capitalize;">{{spree.checkouts.currentState}}</legend>
     {{#each spree.currentOrder.errors.base as |error|}}
@@ -24,7 +24,7 @@ apprpriate hooks and data sets available on the Checkouts service.
 
     <!-- Delivery --> 
     {{#if spree.checkouts.isInDelivery}}
-      {{#each shipment in spree.currentOrder.shipments}}
+      {{#each spree.currentOrder.shipments as |shipment|}}
         {{spree-shipment shipment=shipment}}
       {{/each}}
     {{/if}}
@@ -50,7 +50,7 @@ apprpriate hooks and data sets available on the Checkouts service.
 
   </fieldset>
   <button 
-    {{bind-attr class=":expand spree.checkouts.isLoading:disabled"}}
+    class="expand {{if spree.checkouts.isLoading 'disabled' ''}}"
     {{action 'transitionCheckoutState'}}>{{if spree.checkouts.isLoading "Loading" "Continue"}}</button>
 </form>
 
diff --git a/packages/storefront/addon/templates/components/spree-grid.hbs b/packages/storefront/addon/templates/components/spree-grid.hbs
index 722390a..4178541 100644
--- a/packages/storefront/addon/templates/components/spree-grid.hbs
+++ b/packages/storefront/addon/templates/components/spree-grid.hbs
@@ -2,7 +2,7 @@
   {{#each products as |product|}}
     {{#link-to 'spree.products.show' product}}
       <div class="small-12 medium-6 columns text-center">
-        <img style="height:100px" {{bind-attr src=product.images.firstObject.largeUrl}}>
+        <img style="height:100px" src="{{product.images.firstObject.largeUrl}}">
         <h6>{{product.name}}</h6>
         <hr>
         <h6>{{product.displayPrice}}</h6>
diff --git a/packages/storefront/addon/templates/components/spree-images.hbs b/packages/storefront/addon/templates/components/spree-images.hbs
index 3b079b7..bb1fb8e 100644
--- a/packages/storefront/addon/templates/components/spree-images.hbs
+++ b/packages/storefront/addon/templates/components/spree-images.hbs
@@ -1,15 +1,15 @@
 <div class="row">
   <div class="small-12 columns">
-    <img {{bind-attr src=selectedImage.largeUrl}}>
+    <img src="{{selectedImage.largeUrl}}">
     <hr>
   </div>
   <div class="small-12 columns">
     <div class="row">
-      {{#each image in images}}
+      {{#each images as |image|}}
         <div class="small-3 columns left" {{action 'selectImage' image}}>
-          <img {{bind-attr src=image.largeUrl}}>
+          <img src="{{image.largeUrl}}">
         </div>
       {{/each}}
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/packages/storefront/addon/templates/components/spree-lineitems.hbs b/packages/storefront/addon/templates/components/spree-lineitems.hbs
index fc75a73..675e90a 100644
--- a/packages/storefront/addon/templates/components/spree-lineitems.hbs
+++ b/packages/storefront/addon/templates/components/spree-lineitems.hbs
@@ -11,9 +11,9 @@
     </tr>
   </thead>
   <tbody>
-    {{#each lineItem in lineItems}}
+    {{#each lineItems as |lineItem|}}
       <tr>
-        <td width="120"><img {{bind-attr src=lineItem.variant.images.firstObject.smallUrl}}></td>
+        <td width="120"><img src="{{lineItem.variant.images.firstObject.smallUrl}}"></td>
         <td>
           <h5>{{lineItem.variant.name}}</h5>
           <p>{{lineItem.variant.optionsText}}</p>
diff --git a/packages/storefront/addon/templates/components/spree-pdp.hbs b/packages/storefront/addon/templates/components/spree-pdp.hbs
index c8263e4..9bf74d1 100644
--- a/packages/storefront/addon/templates/components/spree-pdp.hbs
+++ b/packages/storefront/addon/templates/components/spree-pdp.hbs
@@ -17,7 +17,7 @@
       {{#if product.variants.length}}
         <div class="small-12 medium-6 columns left">
           <h3>Variants</h3>
-          {{view "select" content=product.variants optionLabelPath="content.optionsText" selection=selectedVariant}}
+          {{view 'select' content=product.variants optionLabelPath="content.optionsText" selection=selectedVariant}}
         </div>
       {{/if}}
       <div class="small-12 medium-6  columns left">
diff --git a/packages/storefront/addon/templates/components/spree-properties.hbs b/packages/storefront/addon/templates/components/spree-properties.hbs
index f6c96af..21b7b71 100644
--- a/packages/storefront/addon/templates/components/spree-properties.hbs
+++ b/packages/storefront/addon/templates/components/spree-properties.hbs
@@ -4,7 +4,7 @@
       <hr>
       <h4>Properties</h4>
       <table>
-        {{#each property in properties}}
+        {{#each properties as |property|}}
           <tr>
             <td>{{property.presentation}}</td>
             <td>{{property.value}}</td>
@@ -13,4 +13,4 @@
       </table>
     </div>
   </div>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/packages/storefront/addon/templates/components/spree-select.hbs b/packages/storefront/addon/templates/components/spree-select.hbs
index a14c84d..223ac9d 100644
--- a/packages/storefront/addon/templates/components/spree-select.hbs
+++ b/packages/storefront/addon/templates/components/spree-select.hbs
@@ -1,10 +1,9 @@
 <label>
   {{if label label attributeName}}
-  {{view "select" content=content 
-                  optionLabelPath=optionLabelPath 
-                  selection=selection
-                  prompt=prompt
-                  classBinding="errors.length:error"}}
+  {{view 'select' content=content 
+             optionLabelPath=optionLabelPath 
+             selection=selection
+             prompt=prompt}}
               
 </label>
 {{#if errors.length}}<small class="error">{{displayErrors}}</small>{{/if}}
diff --git a/packages/storefront/addon/templates/components/spree-shipment.hbs b/packages/storefront/addon/templates/components/spree-shipment.hbs
index 903e81a..e57dfcd 100644
--- a/packages/storefront/addon/templates/components/spree-shipment.hbs
+++ b/packages/storefront/addon/templates/components/spree-shipment.hbs
@@ -4,11 +4,11 @@
       <h6>Stock Location: {{shipment.stockLocation.name}}, {{shipment.number}}</h6>
       <hr>
     </div>
-    {{#each lineItem in shipment.lineItems}}
+    {{#each shipment.lineItems as |lineItem|}}
       <div class="small-12 columns">
         <div class="row">
           <div class="small-2 columns">
-            <img {{bind-attr src=lineItem.variant.images.firstObject.smallUrl}} >
+            <img src='{{lineItem.variant.images.firstObject.smallUrl}}' >
           </div>
           <div class="small-6 columns">
             <h6>{{lineItem.variant.name}}</h6>
@@ -25,7 +25,7 @@
     {{/each}}
     <div class="small-12 columns">
       <h6>Choose a shipping Rate</h6>
-      {{view "select" content=shipment.shippingRates optionLabelPath="content.name" selection=shipment.selectedShippingRate}}
+      {{view 'select' content=shipment.shippingRates optionLabelPath="content.name" selection=shipment.selectedShippingRate}}
     </div>
   </div>
 </div>
diff --git a/packages/storefront/addon/templates/components/spree-taxonomies.hbs b/packages/storefront/addon/templates/components/spree-taxonomies.hbs
index 3190639..2d420ca 100644
--- a/packages/storefront/addon/templates/components/spree-taxonomies.hbs
+++ b/packages/storefront/addon/templates/components/spree-taxonomies.hbs
@@ -1,7 +1,7 @@
 <nav id="taxonomies" class="sidebar-item">
   <ul class="side-nav">
-    {{#each taxonomy in taxonomies}}
+    {{#each taxonomies as |taxonomy|}}
       {{spree-taxonomy taxonomy=taxonomy}}
     {{/each}}
   </ul>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/packages/storefront/addon/templates/components/spree-taxonomy.hbs b/packages/storefront/addon/templates/components/spree-taxonomy.hbs
index a10d844..b77b127 100644
--- a/packages/storefront/addon/templates/components/spree-taxonomy.hbs
+++ b/packages/storefront/addon/templates/components/spree-taxonomy.hbs
@@ -1,5 +1,5 @@
 <h4 class="taxonomy-root">{{taxonomy.prettyName}}</h4>
-{{#each taxon in childTaxons}}
+{{#each childTaxons as |taxon|}}
   <li>
     {{#link-to 'spree.taxons' taxon.permalink class='list-group-item'}}{{taxon.name}}{{/link-to}}
   </li>
diff --git a/packages/storefront/app/templates/spree/checkout.hbs b/packages/storefront/app/templates/spree/checkout.hbs
index a96a42f..ae3616e 100644
--- a/packages/storefront/app/templates/spree/checkout.hbs
+++ b/packages/storefront/app/templates/spree/checkout.hbs
@@ -13,7 +13,7 @@
     </div>
   {{/unless}}
 
-  <div {{bind-attr class=":small-12 spree.checkouts.isInConfirm:large-12:large-8 :columns"}}>
+  <div class="small-12 columns {{if spree.checkouts.isInConfirm 'large-12' 'large-8'}}">
     {{spree-checkout}}
   </div>
 </div>
diff --git a/packages/storefront/config/ember-try.js b/packages/storefront/config/ember-try.js
index 83dab0f..15931fd 100644
--- a/packages/storefront/config/ember-try.js
+++ b/packages/storefront/config/ember-try.js
@@ -4,6 +4,24 @@ module.exports = {
       name: 'default',
       dependencies: { }
     },
+    {
+      name: 'ember-1.11.0',
+      dependencies: {
+        'ember': '1.11.0'
+      }
+    },
+    {
+      name: 'ember-1.12.0',
+      dependencies: {
+        'ember': '1.12.0'
+      }
+    },
+    {
+      name: 'ember-1.13.0',
+      dependencies: {
+        'ember': '1.13.0'
+      }
+    },
     {
       name: 'ember-release',
       dependencies: {
diff --git a/packages/storefront/package.json b/packages/storefront/package.json
index fba78a9..6469287 100644
--- a/packages/storefront/package.json
+++ b/packages/storefront/package.json
@@ -23,7 +23,6 @@
     "ember-cli-app-version": "0.3.3",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "^1.0.0",
-    "ember-cli-htmlbars": "0.7.6",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-qunit": "0.3.13",
diff --git a/packages/storefront/tests/.jshintrc b/packages/storefront/tests/.jshintrc
index ea8b88f..a11f54a 100644
--- a/packages/storefront/tests/.jshintrc
+++ b/packages/storefront/tests/.jshintrc
@@ -12,6 +12,7 @@
     "exists",
     "fillIn",
     "click",
+    "select",
     "keyEvent",
     "triggerEvent",
     "find",
diff --git a/packages/storefront/tests/test-helper.js b/packages/storefront/tests/test-helper.js
index e6cfb70..35461bf 100644
--- a/packages/storefront/tests/test-helper.js
+++ b/packages/storefront/tests/test-helper.js
@@ -1,4 +1,6 @@
 import resolver from './helpers/resolver';
+import registerSelectHelper from './helpers/register-select-helper';
+registerSelectHelper();
 import {
   setResolver
 } from 'ember-qunit';

From a78ca3c9633ca0724b6ec707847f8135a7680a09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gast=C3=B3n=20I=2E=20Silva?= <givanse@gmail.com>
Date: Sun, 12 Jul 2015 20:54:06 -0500
Subject: [PATCH 02/10] [core] bump to ember-cli 1.13.1 and ember 1.13.0

---
 packages/core/.npmignore                      |  1 +
 packages/core/Brocfile.js                     | 16 ----------------
 packages/core/addon/adapters/spree.js         |  6 +++---
 packages/core/addon/serializers/spree.js      |  6 ++++--
 .../core/app/initializers/spree-ember-core.js |  6 ------
 packages/core/app/models/taxonomy.js          |  9 +++++----
 packages/core/app/services/spree.js           |  2 +-
 packages/core/bower.json                      | 10 +++++-----
 packages/core/config/ember-try.js             | 19 +++++++++++++++++++
 packages/core/ember-cli-build.js              | 17 +++++++++++++++++
 packages/core/package.json                    | 16 ++++++++++------
 packages/core/tests/.jshintrc                 |  5 +++--
 packages/core/tests/helpers/start-app.js      |  1 -
 .../handles-nested-server-errors-test.js      |  2 +-
 packages/core/tests/unit/models/order-test.js |  2 +-
 packages/core/tests/unit/models/taxon-test.js |  2 +-
 .../core/tests/unit/models/taxonomy-test.js   |  2 +-
 .../core/tests/unit/serializers/spree-test.js |  2 +-
 18 files changed, 73 insertions(+), 51 deletions(-)
 delete mode 100644 packages/core/Brocfile.js
 create mode 100644 packages/core/ember-cli-build.js

diff --git a/packages/core/.npmignore b/packages/core/.npmignore
index 49996f5..d522ca2 100644
--- a/packages/core/.npmignore
+++ b/packages/core/.npmignore
@@ -10,5 +10,6 @@ dist/
 .npmignore
 **/.gitkeep
 bower.json
+ember-cli-build.js
 Brocfile.js
 testem.json
diff --git a/packages/core/Brocfile.js b/packages/core/Brocfile.js
deleted file mode 100644
index 2a682c0..0000000
--- a/packages/core/Brocfile.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/* jshint node: true */
-/* global require, module */
-
-var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
-
-/*
-  This Brocfile specifes the options for the dummy test app of this
-  addon, located in `/tests/dummy`
-
-  This Brocfile does *not* influence how the addon or the app using it
-  behave. You most likely want to be modifying `./index.js` or app's Brocfile
-*/
-
-var app = new EmberAddon();
-
-module.exports = app.toTree();
diff --git a/packages/core/addon/adapters/spree.js b/packages/core/addon/adapters/spree.js
index ce9ad1d..b8dcfcf 100644
--- a/packages/core/addon/adapters/spree.js
+++ b/packages/core/addon/adapters/spree.js
@@ -1,15 +1,15 @@
 import Ember from 'ember';
-import DS from 'ember-data';
+import ActiveModelAdapter from 'active-model-adapter';
 /**
   The Spree Adapter is responsible for communicating with your Spree store.  It
   assumes your server has the `spree_ams` gem installed.
 
   @class Spree
   @namespace Adapter
-  @extends DS.ActiveModelAdapter
+  @extends ActiveModelAdapter
 */
 
-export default DS.ActiveModelAdapter.extend({
+export default ActiveModelAdapter.extend({
   /**
     The container lookup name for the default Spree serializer.
 
diff --git a/packages/core/addon/serializers/spree.js b/packages/core/addon/serializers/spree.js
index 4067717..7d0284c 100644
--- a/packages/core/addon/serializers/spree.js
+++ b/packages/core/addon/serializers/spree.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import DS from 'ember-data';
+import { ActiveModelSerializer } from 'active-model-adapter';
 
 /**
   The Spree Serializer is based on the `DS.ActiveModelSerializer`, but implements
@@ -30,7 +30,7 @@ import DS from 'ember-data';
   @module spree-ember-core/serializers/spree
   @extends DS.ActiveModelSerializer
 */
-export default DS.ActiveModelSerializer.extend({
+export default ActiveModelSerializer.extend({
   /**
     Serializes a record for sending to the Spree server.  Here, we extend the
     default behaviour of `DS.ActiveModelSerializer#serialize` to ensure that we
@@ -43,6 +43,8 @@ export default DS.ActiveModelSerializer.extend({
     @return {Object} A JSON object representing the record.
   */
   serialize: function(record) {
+    //TODO: receive a Snapshot instead of a record
+    //see: https://github.com/emberjs/data/issues/2893#issuecomment-82517432
     var payload = this._super.apply(this, arguments);
     record.eachAttribute(function(name, meta) {
       if (!meta.options.persistToServer) {
diff --git a/packages/core/app/initializers/spree-ember-core.js b/packages/core/app/initializers/spree-ember-core.js
index ae4107c..6e7aafd 100644
--- a/packages/core/app/initializers/spree-ember-core.js
+++ b/packages/core/app/initializers/spree-ember-core.js
@@ -1,4 +1,3 @@
-import ENV from '../config/environment';
 import SpreeSerializer from 'spree-ember-core/serializers/spree';
 import SpreeAdapter from 'spree-ember-core/adapters/spree';
 
@@ -14,11 +13,6 @@ export function initialize(container, application) {
   application.inject('route', 'spree', 'service:spree');
   application.inject('controller', 'spree', 'service:spree');
   application.inject('component', 'spree', 'service:spree');
-
-  /* Copy Environment and Spree Configuration to Spree Service */
-  var SpreeService = container.lookup('service:spree');
-  SpreeService.set('environment', ENV.environment);
-  SpreeService.set('config', ENV['spree'] || {});
 }
 
 export default {
diff --git a/packages/core/app/models/taxonomy.js b/packages/core/app/models/taxonomy.js
index dba2f74..9a26667 100644
--- a/packages/core/app/models/taxonomy.js
+++ b/packages/core/app/models/taxonomy.js
@@ -1,3 +1,4 @@
+import Ember from 'ember';
 import DS from 'ember-data';
 
 export default DS.Model.extend({
@@ -6,11 +7,11 @@ export default DS.Model.extend({
   prettyName: DS.attr('string'),
   taxons: DS.hasMany('taxon'),
 
-  root: function() {
+  root: Ember.computed('taxons', function() {
     return this.get('taxons').findBy('parentId', undefined);
-  }.property('taxons'),
+  }),
 
-  taxonsExcludingRoot: function() {
+  taxonsExcludingRoot: Ember.computed('taxons', function() {
     return this.get('taxons').filterBy('parentId');
-  }.property('taxons')
+  })
 });
diff --git a/packages/core/app/services/spree.js b/packages/core/app/services/spree.js
index db4bb4d..fb167c4 100644
--- a/packages/core/app/services/spree.js
+++ b/packages/core/app/services/spree.js
@@ -16,7 +16,7 @@ import Storable from 'spree-ember-core/mixins/storable';
   @uses Ember.Evented, SpreeEmber.Storable, SpreeEmber.Store
 */
 
-export default Ember.Object.extend(Ember.Evented, Storable, {
+export default Ember.Service.extend(Ember.Evented, Storable, {
   /**
     The Local Storage key we use to Restore and Persist data across browser refreshes.
 
diff --git a/packages/core/bower.json b/packages/core/bower.json
index 4eba2d0..be0481a 100644
--- a/packages/core/bower.json
+++ b/packages/core/bower.json
@@ -4,13 +4,13 @@
     "ember": "1.12.0",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": "1.0.0-beta.18",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
-    "ember-qunit": "0.3.3",
+    "ember-data": "v1.0.0-beta.18",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
+    "ember-qunit": "0.4.1",
     "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.15",
+    "ember-resolver": "~0.1.18",
     "jquery": "^1.11.1",
     "loader.js": "ember-cli/loader.js#3.2.0",
     "qunit": "~1.17.1"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/core/config/ember-try.js b/packages/core/config/ember-try.js
index 83dab0f..e9a22b0 100644
--- a/packages/core/config/ember-try.js
+++ b/packages/core/config/ember-try.js
@@ -4,6 +4,25 @@ module.exports = {
       name: 'default',
       dependencies: { }
     },
+    {
+      name: 'ember-1.11.0',
+      dependencies: {
+        'ember': '1.11.0'
+      }
+    },
+    {
+      name: 'ember-1.13.0',
+      dependencies: {
+        'ember': '1.13.0',
+      }
+    },
+    {
+      name: 'ember-ember-data-1.13.0',
+      dependencies: {
+        'ember': '1.13.0',
+        'ember-data': '1.13.0'
+      }
+    },
     {
       name: 'ember-release',
       dependencies: {
diff --git a/packages/core/ember-cli-build.js b/packages/core/ember-cli-build.js
new file mode 100644
index 0000000..d37d64c
--- /dev/null
+++ b/packages/core/ember-cli-build.js
@@ -0,0 +1,17 @@
+/* global require, module */
+var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
+
+module.exports = function(defaults) {
+  var app = new EmberApp(defaults, {
+    // Add options here
+  });
+
+  /*
+    This build file specifes the options for the dummy test app of this
+    addon, located in `/tests/dummy`
+    This build file does *not* influence how the addon or the app using it
+    behave. You most likely want to be modifying `./index.js` or app's build file
+  */
+
+  return app.toTree();
+};
diff --git a/packages/core/package.json b/packages/core/package.json
index aa56cc8..382a5da 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -19,24 +19,28 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "0.2.7",
-    "ember-cli-app-version": "0.3.3",
+    "ember-cli": "1.13.1",
+    "ember-cli-app-version": "0.4.0",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "^1.0.0",
-    "ember-cli-htmlbars": "0.7.6",
-    "ember-cli-ic-ajax": "0.1.1",
+    "ember-cli-htmlbars": "0.7.9",
+    "ember-cli-htmlbars-inline-precompile": "^0.1.1",
+    "ember-cli-ic-ajax": "0.2.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.3.13",
+    "ember-cli-qunit": "0.3.15",
+    "ember-cli-release": "0.2.3",
     "ember-cli-uglify": "^1.0.1",
     "ember-data": "1.0.0-beta.18",
+    "ember-disable-prototype-extensions": "^1.0.0",
     "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2",
-    "ember-try": "0.0.6"
+    "ember-try": "0.0.7"
   },
   "keywords": [
     "ember-addon"
   ],
   "dependencies": {
+    "active-model-adapter": "1.13.3",
     "ember-cli-babel": "^5.0.0"
   },
   "ember-addon": {
diff --git a/packages/core/tests/.jshintrc b/packages/core/tests/.jshintrc
index ea8b88f..6ec0b7c 100644
--- a/packages/core/tests/.jshintrc
+++ b/packages/core/tests/.jshintrc
@@ -26,7 +26,7 @@
   "node": false,
   "browser": false,
   "boss": true,
-  "curly": false,
+  "curly": true,
   "debug": false,
   "devel": false,
   "eqeqeq": true,
@@ -47,5 +47,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true
+  "esnext": true,
+  "unused": true
 }
diff --git a/packages/core/tests/helpers/start-app.js b/packages/core/tests/helpers/start-app.js
index 16cc7c3..0f7aab1 100644
--- a/packages/core/tests/helpers/start-app.js
+++ b/packages/core/tests/helpers/start-app.js
@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import Application from '../../app';
-import Router from '../../router';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
diff --git a/packages/core/tests/unit/mixins/handles-nested-server-errors-test.js b/packages/core/tests/unit/mixins/handles-nested-server-errors-test.js
index 5c93024..c76aed3 100644
--- a/packages/core/tests/unit/mixins/handles-nested-server-errors-test.js
+++ b/packages/core/tests/unit/mixins/handles-nested-server-errors-test.js
@@ -5,7 +5,7 @@ import {
   test
 } from 'ember-qunit';
 
-moduleForModel('order', 'Order', {
+moduleForModel('order', 'Unit | Mixin | Order', {
   needs: [
     'model:user',
     'model:address',
diff --git a/packages/core/tests/unit/models/order-test.js b/packages/core/tests/unit/models/order-test.js
index fbfbc13..0c2e0a2 100644
--- a/packages/core/tests/unit/models/order-test.js
+++ b/packages/core/tests/unit/models/order-test.js
@@ -3,7 +3,7 @@ import {
   test
 } from 'ember-qunit';
 
-moduleForModel('order', 'Order', {
+moduleForModel('order', 'Unit | Model | Order', {
   // Specify the other units that are required for this test.
   needs: [
     'model:user',
diff --git a/packages/core/tests/unit/models/taxon-test.js b/packages/core/tests/unit/models/taxon-test.js
index ce2a420..3df7a54 100644
--- a/packages/core/tests/unit/models/taxon-test.js
+++ b/packages/core/tests/unit/models/taxon-test.js
@@ -3,7 +3,7 @@ import {
   test
 } from 'ember-qunit';
 
-moduleForModel('taxon', 'Taxon', {
+moduleForModel('taxon', 'Unit | Model | taxon', {
   // Specify the other units that are required for this test.
   needs: [
     'model:taxonomy'
diff --git a/packages/core/tests/unit/models/taxonomy-test.js b/packages/core/tests/unit/models/taxonomy-test.js
index 07c66af..d94942f 100644
--- a/packages/core/tests/unit/models/taxonomy-test.js
+++ b/packages/core/tests/unit/models/taxonomy-test.js
@@ -3,7 +3,7 @@ import {
   test
 } from 'ember-qunit';
 
-moduleForModel('taxonomy', 'Taxonomy', {
+moduleForModel('taxonomy', 'Unit | Model | taxonomy', {
   // Specify the other units that are required for this test.
   needs: [
     'model:taxon'
diff --git a/packages/core/tests/unit/serializers/spree-test.js b/packages/core/tests/unit/serializers/spree-test.js
index 1e758f2..e841af6 100644
--- a/packages/core/tests/unit/serializers/spree-test.js
+++ b/packages/core/tests/unit/serializers/spree-test.js
@@ -5,7 +5,7 @@ import {
   test
 } from 'ember-qunit';
 
-moduleFor('serializer:spree', 'SpreeSerializer', {
+moduleFor('serializer:spree', 'Unit | Serializer | SpreeSerializer', {
   needs: ['store:spree']
 });
 

From 921f4dec28b4d9270a192af57e123be369eb4587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gast=C3=B3n=20I=2E=20Silva?= <givanse@gmail.com>
Date: Sun, 12 Jul 2015 23:56:16 -0500
Subject: [PATCH 03/10] [checkouts] ember-cli 1.13.1 and ember 1.13.0

---
 packages/checkouts/.jshintrc                  |  2 +-
 packages/checkouts/.npmignore                 |  1 +
 packages/checkouts/Brocfile.js                | 16 ----------
 packages/checkouts/README.md                  | 31 +++++++++++++++++++
 .../app/initializers/spree-ember-checkouts.js |  5 ++-
 packages/checkouts/bower.json                 |  8 ++---
 packages/checkouts/config/ember-try.js        | 19 ++++++++++++
 packages/checkouts/config/environment.js      | 15 ++++++++-
 packages/checkouts/ember-cli-build.js         | 17 ++++++++++
 packages/checkouts/package.json               | 13 +++++---
 packages/checkouts/tests/.jshintrc            |  5 +--
 .../tests/acceptance/checkout-test.js         |  2 +-
 packages/checkouts/tests/helpers/start-app.js |  1 -
 packages/checkouts/vendor/ember-fsm.js        |  6 ++--
 14 files changed, 107 insertions(+), 34 deletions(-)
 delete mode 100644 packages/checkouts/Brocfile.js
 create mode 100644 packages/checkouts/ember-cli-build.js

diff --git a/packages/checkouts/.jshintrc b/packages/checkouts/.jshintrc
index 08096ef..0f54024 100644
--- a/packages/checkouts/.jshintrc
+++ b/packages/checkouts/.jshintrc
@@ -6,7 +6,7 @@
   ],
   "browser": true,
   "boss": true,
-  "curly": true,
+  "curly": false,
   "debug": false,
   "devel": true,
   "eqeqeq": true,
diff --git a/packages/checkouts/.npmignore b/packages/checkouts/.npmignore
index 49996f5..d522ca2 100644
--- a/packages/checkouts/.npmignore
+++ b/packages/checkouts/.npmignore
@@ -10,5 +10,6 @@ dist/
 .npmignore
 **/.gitkeep
 bower.json
+ember-cli-build.js
 Brocfile.js
 testem.json
diff --git a/packages/checkouts/Brocfile.js b/packages/checkouts/Brocfile.js
deleted file mode 100644
index 2a682c0..0000000
--- a/packages/checkouts/Brocfile.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/* jshint node: true */
-/* global require, module */
-
-var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
-
-/*
-  This Brocfile specifes the options for the dummy test app of this
-  addon, located in `/tests/dummy`
-
-  This Brocfile does *not* influence how the addon or the app using it
-  behave. You most likely want to be modifying `./index.js` or app's Brocfile
-*/
-
-var app = new EmberAddon();
-
-module.exports = app.toTree();
diff --git a/packages/checkouts/README.md b/packages/checkouts/README.md
index 56aedff..fa983c4 100644
--- a/packages/checkouts/README.md
+++ b/packages/checkouts/README.md
@@ -102,3 +102,34 @@ this.spree.on('didAddToCart', function(lineItem) {
 ```
 
 #### **For more information, please see the [spree-ember-checkouts API Documentation.](http://www.spree-ember.com/checkouts/index.html)**
+
+## Testing 
+
+```bash
+npm install
+bower install
+# current Ember version
+ember test
+# all supported Ember versions
+npm test
+```
+
+Note, if you serve the app to open the tests URL in a browser,
+don't forget to use the test environment.
+
+```bash
+ember serve --environment=test
+```
+
+## Contributing 
+
+In the addon folder
+```bash
+npm link
+```
+
+In your project folder
+```bash
+npm link spree-ember-storefront
+ember generate spree-ember-storefront
+```
diff --git a/packages/checkouts/app/initializers/spree-ember-checkouts.js b/packages/checkouts/app/initializers/spree-ember-checkouts.js
index 146d96b..c286bc9 100644
--- a/packages/checkouts/app/initializers/spree-ember-checkouts.js
+++ b/packages/checkouts/app/initializers/spree-ember-checkouts.js
@@ -1,11 +1,14 @@
 import CurrentOrderSupport from 'spree-ember-checkouts/mixins/current-order-support';
 
-export function initialize(container, application) {
+export function initialize(registry, application) {
+  var container = application.__container__; // TODO: deprecated
+
   var SpreeService = container.lookup('service:spree');
   CurrentOrderSupport.apply(SpreeService);
 
   application.deferReadiness();
   SpreeService._restoreCurrentOrder().finally(function() {
+    //TODO:https://github.com/emberjs/ember.js/issues/11247
     application.advanceReadiness();
   });
 }
diff --git a/packages/checkouts/bower.json b/packages/checkouts/bower.json
index eafe91e..6b053c2 100644
--- a/packages/checkouts/bower.json
+++ b/packages/checkouts/bower.json
@@ -5,12 +5,12 @@
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
     "ember-data": "1.0.0-beta.18",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
-    "ember-qunit": "0.3.3",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
+    "ember-qunit": "0.4.1",
     "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.15",
+    "ember-resolver": "~0.1.18",
     "jquery": "^1.11.1",
     "loader.js": "ember-cli/loader.js#3.2.0",
     "qunit": "~1.17.1"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/checkouts/config/ember-try.js b/packages/checkouts/config/ember-try.js
index 83dab0f..e9a22b0 100644
--- a/packages/checkouts/config/ember-try.js
+++ b/packages/checkouts/config/ember-try.js
@@ -4,6 +4,25 @@ module.exports = {
       name: 'default',
       dependencies: { }
     },
+    {
+      name: 'ember-1.11.0',
+      dependencies: {
+        'ember': '1.11.0'
+      }
+    },
+    {
+      name: 'ember-1.13.0',
+      dependencies: {
+        'ember': '1.13.0',
+      }
+    },
+    {
+      name: 'ember-ember-data-1.13.0',
+      dependencies: {
+        'ember': '1.13.0',
+        'ember-data': '1.13.0'
+      }
+    },
     {
       name: 'ember-release',
       dependencies: {
diff --git a/packages/checkouts/config/environment.js b/packages/checkouts/config/environment.js
index 0dfaed4..5e29254 100644
--- a/packages/checkouts/config/environment.js
+++ b/packages/checkouts/config/environment.js
@@ -1,5 +1,18 @@
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {
-  return { };
+  var ENV = {};
+
+    ENV['spree'] = {
+      apiHost: 'http://testing.spree-ember.com',
+      namespace: "api/ams",
+      mount: "/",
+      productsPath: "products",
+      cartPath: "cart",
+      checkoutPath: "checkout",
+      ordersPath: "orders",
+      taxonsPath: "t"
+    };
+
+  return ENV;
 };
diff --git a/packages/checkouts/ember-cli-build.js b/packages/checkouts/ember-cli-build.js
new file mode 100644
index 0000000..d37d64c
--- /dev/null
+++ b/packages/checkouts/ember-cli-build.js
@@ -0,0 +1,17 @@
+/* global require, module */
+var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
+
+module.exports = function(defaults) {
+  var app = new EmberApp(defaults, {
+    // Add options here
+  });
+
+  /*
+    This build file specifes the options for the dummy test app of this
+    addon, located in `/tests/dummy`
+    This build file does *not* influence how the addon or the app using it
+    behave. You most likely want to be modifying `./index.js` or app's build file
+  */
+
+  return app.toTree();
+};
diff --git a/packages/checkouts/package.json b/packages/checkouts/package.json
index 4f1a55f..7cfd490 100644
--- a/packages/checkouts/package.json
+++ b/packages/checkouts/package.json
@@ -19,18 +19,21 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "0.2.7",
-    "ember-cli-app-version": "0.3.3",
+    "ember-cli": "1.13.1",
+    "ember-cli-app-version": "0.4.0",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "^1.0.0",
-    "ember-cli-htmlbars": "0.7.6",
-    "ember-cli-ic-ajax": "0.1.1",
+    "ember-cli-htmlbars": "0.7.9",
+    "ember-cli-htmlbars-inline-precompile": "^0.1.1",
+    "ember-cli-ic-ajax": "0.2.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.3.13",
+    "ember-cli-qunit": "0.3.15",
+    "ember-cli-release": "0.2.3",
     "ember-cli-uglify": "^1.0.1",
     "ember-data": "1.0.0-beta.18",
     "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2",
+    "ember-disable-prototype-extensions": "^1.0.0",
     "ember-try": "0.0.6"
   },
   "keywords": [
diff --git a/packages/checkouts/tests/.jshintrc b/packages/checkouts/tests/.jshintrc
index ea8b88f..6ec0b7c 100644
--- a/packages/checkouts/tests/.jshintrc
+++ b/packages/checkouts/tests/.jshintrc
@@ -26,7 +26,7 @@
   "node": false,
   "browser": false,
   "boss": true,
-  "curly": false,
+  "curly": true,
   "debug": false,
   "devel": false,
   "eqeqeq": true,
@@ -47,5 +47,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true
+  "esnext": true,
+  "unused": true
 }
diff --git a/packages/checkouts/tests/acceptance/checkout-test.js b/packages/checkouts/tests/acceptance/checkout-test.js
index 0991a8f..28c7622 100644
--- a/packages/checkouts/tests/acceptance/checkout-test.js
+++ b/packages/checkouts/tests/acceptance/checkout-test.js
@@ -95,7 +95,7 @@ test('can advance order state', function(assert) {
       assert.equal(currentOrder.get('state'), 'cart');
       assert.equal(checkouts.get('currentState'), 'cart');
 
-      return checkouts.transition().then(function(order){
+      return checkouts.transition().then(function(/*order*/){
         assert.equal(currentOrder.get('state'), 'address');
         assert.equal(checkouts.get('currentState'), 'address');
         assert.ok(currentOrder.get('shipAddress'));
diff --git a/packages/checkouts/tests/helpers/start-app.js b/packages/checkouts/tests/helpers/start-app.js
index 16cc7c3..0f7aab1 100644
--- a/packages/checkouts/tests/helpers/start-app.js
+++ b/packages/checkouts/tests/helpers/start-app.js
@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import Application from '../../app';
-import Router from '../../router';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
diff --git a/packages/checkouts/vendor/ember-fsm.js b/packages/checkouts/vendor/ember-fsm.js
index abd28f1..708369f 100644
--- a/packages/checkouts/vendor/ember-fsm.js
+++ b/packages/checkouts/vendor/ember-fsm.js
@@ -655,7 +655,9 @@ exports["default"] = Ember.Object.extend({
       events.error = { transition: { $all: 'failed' } };
     }
 
-    this.set('activeTransitions', []);
+    //TODO: Local fix used until this is closed:
+    //https://github.com/heycarsten/ember-fsm/issues/16
+    this.set('activeTransitions', Ember.A());
 
     this.definition = new Definition({
       states: states,
@@ -1280,4 +1282,4 @@ exports.bind = bind;function contains(array, item) {
 exports.contains = contains;
 },{}]},{},[2])
 (2)
-});
\ No newline at end of file
+});

From 2a04edb5a6b6db7689ee8aad62232cdd776cedfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gast=C3=B3n=20I=2E=20Silva?= <givanse@gmail.com>
Date: Mon, 13 Jul 2015 01:55:38 -0500
Subject: [PATCH 04/10] [storefront] ember-cli 1.13.1 and ember 1.13.0

---
 packages/storefront/.jshintrc                   |  2 +-
 packages/storefront/.npmignore                  |  1 +
 packages/storefront/README.md                   |  2 +-
 .../storefront/app/controllers/application.js   |  9 +++++++++
 packages/storefront/bower.json                  |  8 ++++----
 packages/storefront/config/ember-try.js         |  9 +++++----
 packages/storefront/ember-cli-build.js          | 17 +++++++++++++++++
 packages/storefront/package.json                | 15 +++++++++------
 packages/storefront/tests/.jshintrc             |  6 +++---
 .../tests/dummy/app/components/.gitkeep         |  0
 .../tests/dummy/app/controllers/.gitkeep        |  0
 .../storefront/tests/dummy/app/helpers/.gitkeep |  0
 .../storefront/tests/dummy/app/models/.gitkeep  |  0
 .../storefront/tests/dummy/app/routes/.gitkeep  |  0
 .../dummy/app/templates/components/.gitkeep     |  0
 .../storefront/tests/dummy/app/views/.gitkeep   |  0
 packages/storefront/tests/helpers/start-app.js  |  1 -
 packages/storefront/tests/test-helper.js        |  2 --
 .../unit/components/spree-breadcrumbs-test.js   |  4 +++-
 .../tests/unit/components/spree-input-test.js   |  3 +--
 20 files changed, 54 insertions(+), 25 deletions(-)
 create mode 100644 packages/storefront/app/controllers/application.js
 create mode 100644 packages/storefront/ember-cli-build.js
 delete mode 100644 packages/storefront/tests/dummy/app/components/.gitkeep
 delete mode 100644 packages/storefront/tests/dummy/app/controllers/.gitkeep
 delete mode 100644 packages/storefront/tests/dummy/app/helpers/.gitkeep
 delete mode 100644 packages/storefront/tests/dummy/app/models/.gitkeep
 delete mode 100644 packages/storefront/tests/dummy/app/routes/.gitkeep
 delete mode 100644 packages/storefront/tests/dummy/app/templates/components/.gitkeep
 delete mode 100644 packages/storefront/tests/dummy/app/views/.gitkeep

diff --git a/packages/storefront/.jshintrc b/packages/storefront/.jshintrc
index 08096ef..0f54024 100644
--- a/packages/storefront/.jshintrc
+++ b/packages/storefront/.jshintrc
@@ -6,7 +6,7 @@
   ],
   "browser": true,
   "boss": true,
-  "curly": true,
+  "curly": false,
   "debug": false,
   "devel": true,
   "eqeqeq": true,
diff --git a/packages/storefront/.npmignore b/packages/storefront/.npmignore
index 49996f5..d522ca2 100644
--- a/packages/storefront/.npmignore
+++ b/packages/storefront/.npmignore
@@ -10,5 +10,6 @@ dist/
 .npmignore
 **/.gitkeep
 bower.json
+ember-cli-build.js
 Brocfile.js
 testem.json
diff --git a/packages/storefront/README.md b/packages/storefront/README.md
index 29dd216..878e1f1 100644
--- a/packages/storefront/README.md
+++ b/packages/storefront/README.md
@@ -70,7 +70,7 @@ bower install
 # current Ember version
 ember test
 # all supported Ember versions
-ember test
+npm test
 ```
 
 ## Contributing 
diff --git a/packages/storefront/app/controllers/application.js b/packages/storefront/app/controllers/application.js
new file mode 100644
index 0000000..9678383
--- /dev/null
+++ b/packages/storefront/app/controllers/application.js
@@ -0,0 +1,9 @@
+import Ember from 'ember';
+
+/*
+  The presence of this controller is a workaround for:
+  Cannot call get with 'currentPath' on an undefined object.
+  https://github.com/ember-cli/ember-cli/issues/1203
+*/
+export default Ember.Controller.extend({
+});
diff --git a/packages/storefront/bower.json b/packages/storefront/bower.json
index 3a30d1a..772c205 100644
--- a/packages/storefront/bower.json
+++ b/packages/storefront/bower.json
@@ -5,12 +5,12 @@
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
     "ember-data": "1.0.0-beta.18",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
-    "ember-qunit": "0.3.3",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
+    "ember-qunit": "0.4.1",
     "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.15",
+    "ember-resolver": "~0.1.18",
     "jquery": "^1.11.1",
     "loader.js": "ember-cli/loader.js#3.2.0",
     "qunit": "~1.17.1"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/storefront/config/ember-try.js b/packages/storefront/config/ember-try.js
index 15931fd..e9a22b0 100644
--- a/packages/storefront/config/ember-try.js
+++ b/packages/storefront/config/ember-try.js
@@ -11,15 +11,16 @@ module.exports = {
       }
     },
     {
-      name: 'ember-1.12.0',
+      name: 'ember-1.13.0',
       dependencies: {
-        'ember': '1.12.0'
+        'ember': '1.13.0',
       }
     },
     {
-      name: 'ember-1.13.0',
+      name: 'ember-ember-data-1.13.0',
       dependencies: {
-        'ember': '1.13.0'
+        'ember': '1.13.0',
+        'ember-data': '1.13.0'
       }
     },
     {
diff --git a/packages/storefront/ember-cli-build.js b/packages/storefront/ember-cli-build.js
new file mode 100644
index 0000000..d37d64c
--- /dev/null
+++ b/packages/storefront/ember-cli-build.js
@@ -0,0 +1,17 @@
+/* global require, module */
+var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
+
+module.exports = function(defaults) {
+  var app = new EmberApp(defaults, {
+    // Add options here
+  });
+
+  /*
+    This build file specifes the options for the dummy test app of this
+    addon, located in `/tests/dummy`
+    This build file does *not* influence how the addon or the app using it
+    behave. You most likely want to be modifying `./index.js` or app's build file
+  */
+
+  return app.toTree();
+};
diff --git a/packages/storefront/package.json b/packages/storefront/package.json
index 6469287..1a8d72d 100644
--- a/packages/storefront/package.json
+++ b/packages/storefront/package.json
@@ -19,25 +19,28 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "0.2.7",
-    "ember-cli-app-version": "0.3.3",
+    "ember-cli": "1.13.1",
+    "ember-cli-app-version": "0.4.0",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "^1.0.0",
-    "ember-cli-ic-ajax": "0.1.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.1.1",
+    "ember-cli-ic-ajax": "0.2.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.3.13",
+    "ember-cli-qunit": "0.3.15",
+    "ember-cli-release": "0.2.3",
     "ember-cli-uglify": "^1.0.1",
     "ember-cli-yuidoc": "0.6.2",
     "ember-data": "1.0.0-beta.18",
     "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2",
-    "ember-try": "0.0.6"
+    "ember-disable-prototype-extensions": "^1.0.0",
+    "ember-try": "0.0.7"
   },
   "keywords": [
     "ember-addon"
   ],
   "dependencies": {
-    "ember-cli-htmlbars": "0.7.6",
+    "ember-cli-htmlbars": "0.7.9",
     "spree-ember-core": "0.0.1-beta.1",
     "spree-ember-checkouts": "0.0.1-beta.1",
     "ember-cli-babel": "^5.0.0"
diff --git a/packages/storefront/tests/.jshintrc b/packages/storefront/tests/.jshintrc
index a11f54a..6ec0b7c 100644
--- a/packages/storefront/tests/.jshintrc
+++ b/packages/storefront/tests/.jshintrc
@@ -12,7 +12,6 @@
     "exists",
     "fillIn",
     "click",
-    "select",
     "keyEvent",
     "triggerEvent",
     "find",
@@ -27,7 +26,7 @@
   "node": false,
   "browser": false,
   "boss": true,
-  "curly": false,
+  "curly": true,
   "debug": false,
   "devel": false,
   "eqeqeq": true,
@@ -48,5 +47,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true
+  "esnext": true,
+  "unused": true
 }
diff --git a/packages/storefront/tests/dummy/app/components/.gitkeep b/packages/storefront/tests/dummy/app/components/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/packages/storefront/tests/dummy/app/controllers/.gitkeep b/packages/storefront/tests/dummy/app/controllers/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/packages/storefront/tests/dummy/app/helpers/.gitkeep b/packages/storefront/tests/dummy/app/helpers/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/packages/storefront/tests/dummy/app/models/.gitkeep b/packages/storefront/tests/dummy/app/models/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/packages/storefront/tests/dummy/app/routes/.gitkeep b/packages/storefront/tests/dummy/app/routes/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/packages/storefront/tests/dummy/app/templates/components/.gitkeep b/packages/storefront/tests/dummy/app/templates/components/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/packages/storefront/tests/dummy/app/views/.gitkeep b/packages/storefront/tests/dummy/app/views/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/packages/storefront/tests/helpers/start-app.js b/packages/storefront/tests/helpers/start-app.js
index 16cc7c3..0f7aab1 100644
--- a/packages/storefront/tests/helpers/start-app.js
+++ b/packages/storefront/tests/helpers/start-app.js
@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import Application from '../../app';
-import Router from '../../router';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
diff --git a/packages/storefront/tests/test-helper.js b/packages/storefront/tests/test-helper.js
index 35461bf..e6cfb70 100644
--- a/packages/storefront/tests/test-helper.js
+++ b/packages/storefront/tests/test-helper.js
@@ -1,6 +1,4 @@
 import resolver from './helpers/resolver';
-import registerSelectHelper from './helpers/register-select-helper';
-registerSelectHelper();
 import {
   setResolver
 } from 'ember-qunit';
diff --git a/packages/storefront/tests/unit/components/spree-breadcrumbs-test.js b/packages/storefront/tests/unit/components/spree-breadcrumbs-test.js
index 32999b8..4fd6e35 100644
--- a/packages/storefront/tests/unit/components/spree-breadcrumbs-test.js
+++ b/packages/storefront/tests/unit/components/spree-breadcrumbs-test.js
@@ -3,7 +3,9 @@ import {
   test
 } from 'ember-qunit';
 
-moduleForComponent('spree-breadcrumbs');
+moduleForComponent('spree-breadcrumbs', {
+  unit: true
+});
 
 test('it renders', function(assert) {
   assert.expect(2);
diff --git a/packages/storefront/tests/unit/components/spree-input-test.js b/packages/storefront/tests/unit/components/spree-input-test.js
index 795166d..51f5064 100644
--- a/packages/storefront/tests/unit/components/spree-input-test.js
+++ b/packages/storefront/tests/unit/components/spree-input-test.js
@@ -4,8 +4,7 @@ import {
 } from 'ember-qunit';
 
 moduleForComponent('spree-input', {
-  // specify the other units that are required for this test
-  // needs: ['component:foo', 'helper:bar']
+  unit: true
 });
 
 test('it renders', function(assert) {

From 23f005649ad071e5283da06cfe1a8f25e8babb24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gast=C3=B3n=20I=2E=20Silva?= <givanse@gmail.com>
Date: Mon, 13 Jul 2015 03:14:46 -0500
Subject: [PATCH 05/10] drop 0.11

---
 packages/checkouts/.travis.yml          | 3 +++
 packages/checkouts/config/ember-try.js  | 6 ------
 packages/core/.travis.yml               | 3 +++
 packages/core/config/ember-try.js       | 6 ------
 packages/storefront/.travis.yml         | 2 ++
 packages/storefront/config/ember-try.js | 6 ------
 6 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/packages/checkouts/.travis.yml b/packages/checkouts/.travis.yml
index 8197d31..7d6a1f2 100644
--- a/packages/checkouts/.travis.yml
+++ b/packages/checkouts/.travis.yml
@@ -11,6 +11,7 @@ cache:
 
 env:
   - EMBER_TRY_SCENARIO=default
+  - EMBER_TRY_SCENARIO=ember-1.13.0
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
@@ -18,6 +19,8 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
+    - env: EMBER_TRY_SCENARIO=ember-release
+    - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
diff --git a/packages/checkouts/config/ember-try.js b/packages/checkouts/config/ember-try.js
index e9a22b0..4ae924a 100644
--- a/packages/checkouts/config/ember-try.js
+++ b/packages/checkouts/config/ember-try.js
@@ -4,12 +4,6 @@ module.exports = {
       name: 'default',
       dependencies: { }
     },
-    {
-      name: 'ember-1.11.0',
-      dependencies: {
-        'ember': '1.11.0'
-      }
-    },
     {
       name: 'ember-1.13.0',
       dependencies: {
diff --git a/packages/core/.travis.yml b/packages/core/.travis.yml
index 8197d31..7d6a1f2 100644
--- a/packages/core/.travis.yml
+++ b/packages/core/.travis.yml
@@ -11,6 +11,7 @@ cache:
 
 env:
   - EMBER_TRY_SCENARIO=default
+  - EMBER_TRY_SCENARIO=ember-1.13.0
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
@@ -18,6 +19,8 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
+    - env: EMBER_TRY_SCENARIO=ember-release
+    - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
diff --git a/packages/core/config/ember-try.js b/packages/core/config/ember-try.js
index e9a22b0..4ae924a 100644
--- a/packages/core/config/ember-try.js
+++ b/packages/core/config/ember-try.js
@@ -4,12 +4,6 @@ module.exports = {
       name: 'default',
       dependencies: { }
     },
-    {
-      name: 'ember-1.11.0',
-      dependencies: {
-        'ember': '1.11.0'
-      }
-    },
     {
       name: 'ember-1.13.0',
       dependencies: {
diff --git a/packages/storefront/.travis.yml b/packages/storefront/.travis.yml
index 968a0dd..7d6a1f2 100644
--- a/packages/storefront/.travis.yml
+++ b/packages/storefront/.travis.yml
@@ -11,6 +11,7 @@ cache:
 
 env:
   - EMBER_TRY_SCENARIO=default
+  - EMBER_TRY_SCENARIO=ember-1.13.0
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
@@ -18,6 +19,7 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
+    - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
 
diff --git a/packages/storefront/config/ember-try.js b/packages/storefront/config/ember-try.js
index e9a22b0..4ae924a 100644
--- a/packages/storefront/config/ember-try.js
+++ b/packages/storefront/config/ember-try.js
@@ -4,12 +4,6 @@ module.exports = {
       name: 'default',
       dependencies: { }
     },
-    {
-      name: 'ember-1.11.0',
-      dependencies: {
-        'ember': '1.11.0'
-      }
-    },
     {
       name: 'ember-1.13.0',
       dependencies: {

From 15b34ccdb143f5ad6209a0489a331807641f47de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gast=C3=B3n=20I=2E=20Silva?= <givanse@gmail.com>
Date: Mon, 13 Jul 2015 03:45:02 -0500
Subject: [PATCH 06/10] address diff comments

---
 packages/checkouts/config/environment.js          | 15 +--------------
 .../core/app/initializers/spree-ember-core.js     |  5 +++++
 .../addon/templates/components/spree-select.hbs   |  6 +++---
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/packages/checkouts/config/environment.js b/packages/checkouts/config/environment.js
index 5e29254..9707ea6 100644
--- a/packages/checkouts/config/environment.js
+++ b/packages/checkouts/config/environment.js
@@ -1,18 +1,5 @@
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {
-  var ENV = {};
-
-    ENV['spree'] = {
-      apiHost: 'http://testing.spree-ember.com',
-      namespace: "api/ams",
-      mount: "/",
-      productsPath: "products",
-      cartPath: "cart",
-      checkoutPath: "checkout",
-      ordersPath: "orders",
-      taxonsPath: "t"
-    };
-
-  return ENV;
+  return {};
 };
diff --git a/packages/core/app/initializers/spree-ember-core.js b/packages/core/app/initializers/spree-ember-core.js
index 6e7aafd..dbee1ba 100644
--- a/packages/core/app/initializers/spree-ember-core.js
+++ b/packages/core/app/initializers/spree-ember-core.js
@@ -13,6 +13,11 @@ export function initialize(container, application) {
   application.inject('route', 'spree', 'service:spree');
   application.inject('controller', 'spree', 'service:spree');
   application.inject('component', 'spree', 'service:spree');
+
+  /* Copy Environment and Spree Configuration to Spree Service */
+  var SpreeService = container.lookup('service:spree');
+  SpreeService.set('environment', ENV.environment);
+  SpreeService.set('config', ENV['spree'] || {});
 }
 
 export default {
diff --git a/packages/storefront/addon/templates/components/spree-select.hbs b/packages/storefront/addon/templates/components/spree-select.hbs
index 223ac9d..7b7f7cd 100644
--- a/packages/storefront/addon/templates/components/spree-select.hbs
+++ b/packages/storefront/addon/templates/components/spree-select.hbs
@@ -1,9 +1,9 @@
 <label>
   {{if label label attributeName}}
   {{view 'select' content=content 
-             optionLabelPath=optionLabelPath 
-             selection=selection
-             prompt=prompt}}
+                  optionLabelPath=optionLabelPath 
+                  selection=selection
+                  prompt=prompt}}
               
 </label>
 {{#if errors.length}}<small class="error">{{displayErrors}}</small>{{/if}}

From 042e0d11ab36558ca76736a67de152a048c9ccef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gast=C3=B3n=20I=2E=20Silva?= <givanse@gmail.com>
Date: Mon, 13 Jul 2015 04:06:33 -0500
Subject: [PATCH 07/10] [auth] ember-cli 1.13.1

---
 packages/auth/.jshintrc                         |  2 +-
 packages/auth/.npmignore                        |  1 +
 packages/auth/.travis.yml                       |  2 ++
 .../spree-ember-auth-setup-session.js           |  3 ++-
 .../auth/app/initializers/spree-ember-auth.js   |  8 +++++---
 packages/auth/bower.json                        |  6 +++---
 packages/auth/config/ember-try.js               | 13 +++++++++++++
 packages/auth/ember-cli-build.js                | 17 +++++++++++++++++
 packages/auth/package.json                      | 17 +++++++++--------
 packages/auth/tests/.jshintrc                   |  5 +++--
 packages/auth/tests/acceptance/account-test.js  |  1 -
 packages/auth/tests/acceptance/signup-test.js   |  2 --
 packages/auth/tests/helpers/start-app.js        |  1 -
 .../tests/unit/components/spree-auth-test.js    |  7 ++++++-
 14 files changed, 62 insertions(+), 23 deletions(-)
 create mode 100644 packages/auth/ember-cli-build.js

diff --git a/packages/auth/.jshintrc b/packages/auth/.jshintrc
index 08096ef..0f54024 100644
--- a/packages/auth/.jshintrc
+++ b/packages/auth/.jshintrc
@@ -6,7 +6,7 @@
   ],
   "browser": true,
   "boss": true,
-  "curly": true,
+  "curly": false,
   "debug": false,
   "devel": true,
   "eqeqeq": true,
diff --git a/packages/auth/.npmignore b/packages/auth/.npmignore
index 49996f5..d522ca2 100644
--- a/packages/auth/.npmignore
+++ b/packages/auth/.npmignore
@@ -10,5 +10,6 @@ dist/
 .npmignore
 **/.gitkeep
 bower.json
+ember-cli-build.js
 Brocfile.js
 testem.json
diff --git a/packages/auth/.travis.yml b/packages/auth/.travis.yml
index 968a0dd..7d6a1f2 100644
--- a/packages/auth/.travis.yml
+++ b/packages/auth/.travis.yml
@@ -11,6 +11,7 @@ cache:
 
 env:
   - EMBER_TRY_SCENARIO=default
+  - EMBER_TRY_SCENARIO=ember-1.13.0
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
@@ -18,6 +19,7 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
+    - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
 
diff --git a/packages/auth/app/initializers/spree-ember-auth-setup-session.js b/packages/auth/app/initializers/spree-ember-auth-setup-session.js
index 3de3601..8dddd5e 100644
--- a/packages/auth/app/initializers/spree-ember-auth-setup-session.js
+++ b/packages/auth/app/initializers/spree-ember-auth-setup-session.js
@@ -1,4 +1,5 @@
-export function initialize(container, application) {
+export function initialize(registry, application) {
+  var container = application.__container__; //TODO: remove deprecation
   var SpreeAdapter = container.lookup('adapter:-spree');
   var Session      = container.lookup('simple-auth-session:main');
 
diff --git a/packages/auth/app/initializers/spree-ember-auth.js b/packages/auth/app/initializers/spree-ember-auth.js
index f39686c..d1846f6 100644
--- a/packages/auth/app/initializers/spree-ember-auth.js
+++ b/packages/auth/app/initializers/spree-ember-auth.js
@@ -2,9 +2,11 @@ import Session from 'simple-auth/session';
 import Authorizer from 'spree-ember-auth/authorizers/spree';
 import Authenticator from 'spree-ember-auth/authenticators/spree';
 
-export function initialize(container, application) {
-  container.register('simple-auth-authorizer:spree', Authorizer);
-  container.register('simple-auth-authenticator:spree', Authenticator);
+export function initialize(registry, application) {
+  var container = application.__container__; //TODO: remove deprecation
+
+  application.register('simple-auth-authorizer:spree', Authorizer);
+  application.register('simple-auth-authenticator:spree', Authenticator);
 
   var SpreeAuthorizer    = container.lookup('simple-auth-authorizer:spree');
   var SpreeAuthenticator = container.lookup('simple-auth-authenticator:spree');
diff --git a/packages/auth/bower.json b/packages/auth/bower.json
index 5fbab3c..bf7762c 100644
--- a/packages/auth/bower.json
+++ b/packages/auth/bower.json
@@ -5,10 +5,10 @@
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
     "ember-data": "1.0.0-beta.18",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
-    "ember-qunit": "0.3.3",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
+    "ember-qunit": "0.3.4",
     "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.15",
+    "ember-resolver": "~0.1.18",
     "jquery": "^1.11.1",
     "loader.js": "ember-cli/loader.js#3.2.0",
     "qunit": "~1.17.1",
diff --git a/packages/auth/config/ember-try.js b/packages/auth/config/ember-try.js
index 83dab0f..4ae924a 100644
--- a/packages/auth/config/ember-try.js
+++ b/packages/auth/config/ember-try.js
@@ -4,6 +4,19 @@ module.exports = {
       name: 'default',
       dependencies: { }
     },
+    {
+      name: 'ember-1.13.0',
+      dependencies: {
+        'ember': '1.13.0',
+      }
+    },
+    {
+      name: 'ember-ember-data-1.13.0',
+      dependencies: {
+        'ember': '1.13.0',
+        'ember-data': '1.13.0'
+      }
+    },
     {
       name: 'ember-release',
       dependencies: {
diff --git a/packages/auth/ember-cli-build.js b/packages/auth/ember-cli-build.js
new file mode 100644
index 0000000..d37d64c
--- /dev/null
+++ b/packages/auth/ember-cli-build.js
@@ -0,0 +1,17 @@
+/* global require, module */
+var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
+
+module.exports = function(defaults) {
+  var app = new EmberApp(defaults, {
+    // Add options here
+  });
+
+  /*
+    This build file specifes the options for the dummy test app of this
+    addon, located in `/tests/dummy`
+    This build file does *not* influence how the addon or the app using it
+    behave. You most likely want to be modifying `./index.js` or app's build file
+  */
+
+  return app.toTree();
+};
diff --git a/packages/auth/package.json b/packages/auth/package.json
index ef5244f..6896eb1 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -19,27 +19,28 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "0.2.7",
-    "ember-cli-app-version": "0.3.3",
+    "ember-cli": "1.13.1",
+    "ember-cli-app-version": "0.4.0",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "^1.0.0",
-    "ember-cli-htmlbars": "0.7.6",
-    "ember-cli-ic-ajax": "0.1.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.1.1",
+    "ember-cli-ic-ajax": "0.2.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.3.13",
+    "ember-cli-qunit": "0.3.15",
+    "ember-cli-release": "0.2.3",
     "ember-cli-uglify": "^1.0.1",
     "ember-data": "1.0.0-beta.18",
     "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2",
-    "ember-try": "0.0.6",
-    "ember-cli-simple-auth": "0.8.0-beta.1",
+    "ember-try": "0.0.7",
+    "ember-disable-prototype-extensions": "^1.0.0",
     "ember-cli-yuidoc": "0.6.2"
   },
   "keywords": [
     "ember-addon"
   ],
   "dependencies": {
-    "ember-cli-htmlbars": "0.7.6",
+    "ember-cli-htmlbars": "0.7.9",
     "spree-ember-core": "0.0.1-beta.1",
     "ember-cli-simple-auth": "0.8.0-beta.1",
     "spree-ember-storefront": "0.0.1-beta.1",
diff --git a/packages/auth/tests/.jshintrc b/packages/auth/tests/.jshintrc
index ea8b88f..6ec0b7c 100644
--- a/packages/auth/tests/.jshintrc
+++ b/packages/auth/tests/.jshintrc
@@ -26,7 +26,7 @@
   "node": false,
   "browser": false,
   "boss": true,
-  "curly": false,
+  "curly": true,
   "debug": false,
   "devel": false,
   "eqeqeq": true,
@@ -47,5 +47,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true
+  "esnext": true,
+  "unused": true
 }
diff --git a/packages/auth/tests/acceptance/account-test.js b/packages/auth/tests/acceptance/account-test.js
index 9b5e3b5..f2e98a6 100644
--- a/packages/auth/tests/acceptance/account-test.js
+++ b/packages/auth/tests/acceptance/account-test.js
@@ -21,7 +21,6 @@ module('Acceptance: Account', {
 test('can change password correctly', function(assert) {
   var seed = (new Date()).valueOf().toString();
   var email = 'spree-ember-'+seed+'@example.com';
-  var newSeed  = (new Date()).valueOf().toString();
   var newEmail = 'spree-ember-'+seed+'@example.com';
 
   visit('/account');
diff --git a/packages/auth/tests/acceptance/signup-test.js b/packages/auth/tests/acceptance/signup-test.js
index 5c86264..7b73271 100644
--- a/packages/auth/tests/acceptance/signup-test.js
+++ b/packages/auth/tests/acceptance/signup-test.js
@@ -44,8 +44,6 @@ test('can signup successfully', function(assert) {
 });
 
 test('can not signup with an invalid email', function(assert) {
-  var seed = (new Date()).valueOf().toString();
-
   visit('/account');
 
   andThen(function() {
diff --git a/packages/auth/tests/helpers/start-app.js b/packages/auth/tests/helpers/start-app.js
index 16cc7c3..0f7aab1 100644
--- a/packages/auth/tests/helpers/start-app.js
+++ b/packages/auth/tests/helpers/start-app.js
@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import Application from '../../app';
-import Router from '../../router';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
diff --git a/packages/auth/tests/unit/components/spree-auth-test.js b/packages/auth/tests/unit/components/spree-auth-test.js
index 5d42394..2d43087 100644
--- a/packages/auth/tests/unit/components/spree-auth-test.js
+++ b/packages/auth/tests/unit/components/spree-auth-test.js
@@ -4,7 +4,12 @@ import {
   test
 } from 'ember-qunit';
 
-moduleForComponent('spree-auth', {
+// fails if ember-qunit = 0.4.X 
+// Cannot read property 'recognizer' of undefined
+// fixed in the beta channel (but won't be back ported to 1.13 most likely)
+// https://github.com/switchfly/ember-test-helpers/issues/41
+
+moduleForComponent('spree-auth', 'Unit | Component | spree-auth', {
   // specify the other units that are required for this test
   needs: [
     'component:spree-input'

From 4ee7b741a25461ceb905bf046e4ab02281d56589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gast=C3=B3n=20I=2E=20Silva?= <givanse@gmail.com>
Date: Mon, 13 Jul 2015 04:08:34 -0500
Subject: [PATCH 08/10] [storefront] update spree-ember-storefront blueprint
 templates

---
 .../files/app/templates/components/spree-address.hbs      | 8 ++++++++
 .../files/app/templates/components/spree-breadcrumbs.hbs  | 4 ++--
 .../files/app/templates/components/spree-checkout.hbs     | 7 ++++---
 .../files/app/templates/components/spree-grid.hbs         | 2 +-
 .../files/app/templates/components/spree-images.hbs       | 8 ++++----
 .../files/app/templates/components/spree-lineitems.hbs    | 4 ++--
 .../files/app/templates/components/spree-pdp.hbs          | 2 +-
 .../files/app/templates/components/spree-properties.hbs   | 4 ++--
 .../files/app/templates/components/spree-select.hbs       | 5 ++---
 .../files/app/templates/components/spree-shipment.hbs     | 6 +++---
 .../files/app/templates/components/spree-source.hbs       | 5 +++++
 .../files/app/templates/components/spree-taxonomies.hbs   | 4 ++--
 .../files/app/templates/components/spree-taxonomy.hbs     | 2 +-
 .../files/app/templates/spree/checkout.hbs                | 2 +-
 14 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-address.hbs b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-address.hbs
index 4e4c6e1..8e95dee 100644
--- a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-address.hbs
+++ b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-address.hbs
@@ -1,25 +1,31 @@
 {{spree-input value=address.firstname 
               errors=address.errors.firstname
+              placeholder="First Name"
               attributeName="First Name"}}
 
 {{spree-input value=address.lastname
               errors=address.errors.lastname
+              placeholder="Last Name"
               attributeName="Last Name"}}
 
 {{spree-input value=address.address1
               errors=address.errors.address1
+              placeholder="Address"
               attributeName="Street Address"}}
               
 {{spree-input value=address.address2 
               errors=address.errors.address2
+              placeholder="Address (cont.)"
               attributeName="Address (cont.)"}}
 
 {{spree-input value=address.city
               errors=address.errors.city
+              placeholder="City"
               attributeName="City"}}
               
 {{spree-input value=address.zipcode 
               errors=address.errors.zipcode
+              placeholder="Zipcode"
               attributeName="Zipcode"}}
               
 {{spree-select content=countries 
@@ -40,10 +46,12 @@
   {{#if address.country.statesRequired}}
     {{spree-input value=address.stateName
                   errors=address.errors.stateName
+                  placeholder="State"
                   attributeName="State"}}
   {{/if}}
 {{/if}}
 
 {{spree-input value=address.phone
               errors=address.errors.phone
+              placeholder="Phone"
               attributeName="Phone"}}
diff --git a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-breadcrumbs.hbs b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-breadcrumbs.hbs
index 681cff9..ed921ee 100644
--- a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-breadcrumbs.hbs
+++ b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-breadcrumbs.hbs
@@ -1,6 +1,6 @@
 <ul class="breadcrumbs">
-  {{#each step in steps}}
-    <li {{bind-attr class=step.status}}>
+  {{#each steps as |step|}}
+    <li class="{{step.status}}">
       <a {{action 'clickedCrumb' step}}>{{step.name}}</a>
     </li>
   {{/each}}
diff --git a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-checkout.hbs b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-checkout.hbs
index e16c3fc..c28dc1e 100644
--- a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-checkout.hbs
+++ b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-checkout.hbs
@@ -6,7 +6,7 @@ It's structured like this to demonstrate the style of reactive programming that
 the Stateful Checkout service is designed for.  It's also here to show the 
 apprpriate hooks and data sets available on the Checkouts service.
 -->
-<form {{bind-attr class="spree.checkouts.currentState"}}>
+<form class="{{spree.checkouts.currentState}}">
   <fieldset>
     <legend style="text-transform:capitalize;">{{spree.checkouts.currentState}}</legend>
     {{#each spree.currentOrder.errors.base as |error|}}
@@ -17,13 +17,14 @@ apprpriate hooks and data sets available on the Checkouts service.
     {{#if spree.checkouts.isInAddress}}
       {{spree-input value=spree.currentOrder.email 
                     errors=spree.currentOrder.errors.email
+                    placeholder="Email"
                     attributeName="Email"}}
       {{spree-address address=spree.currentOrder.shipAddress countries=spree.countries}}
     {{/if}}
 
     <!-- Delivery --> 
     {{#if spree.checkouts.isInDelivery}}
-      {{#each shipment in spree.currentOrder.shipments}}
+      {{#each spree.currentOrder.shipments as |shipment|}}
         {{spree-shipment shipment=shipment}}
       {{/each}}
     {{/if}}
@@ -49,7 +50,7 @@ apprpriate hooks and data sets available on the Checkouts service.
 
   </fieldset>
   <button 
-    {{bind-attr class=":expand spree.checkouts.isLoading:disabled"}}
+    class="expand {{if spree.checkouts.isLoading 'disabled' ''}}"
     {{action 'transitionCheckoutState'}}>{{if spree.checkouts.isLoading "Loading" "Continue"}}</button>
 </form>
 
diff --git a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-grid.hbs b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-grid.hbs
index 722390a..4178541 100644
--- a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-grid.hbs
+++ b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-grid.hbs
@@ -2,7 +2,7 @@
   {{#each products as |product|}}
     {{#link-to 'spree.products.show' product}}
       <div class="small-12 medium-6 columns text-center">
-        <img style="height:100px" {{bind-attr src=product.images.firstObject.largeUrl}}>
+        <img style="height:100px" src="{{product.images.firstObject.largeUrl}}">
         <h6>{{product.name}}</h6>
         <hr>
         <h6>{{product.displayPrice}}</h6>
diff --git a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-images.hbs b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-images.hbs
index 3b079b7..bb1fb8e 100644
--- a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-images.hbs
+++ b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-images.hbs
@@ -1,15 +1,15 @@
 <div class="row">
   <div class="small-12 columns">
-    <img {{bind-attr src=selectedImage.largeUrl}}>
+    <img src="{{selectedImage.largeUrl}}">
     <hr>
   </div>
   <div class="small-12 columns">
     <div class="row">
-      {{#each image in images}}
+      {{#each images as |image|}}
         <div class="small-3 columns left" {{action 'selectImage' image}}>
-          <img {{bind-attr src=image.largeUrl}}>
+          <img src="{{image.largeUrl}}">
         </div>
       {{/each}}
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-lineitems.hbs b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-lineitems.hbs
index fc75a73..675e90a 100644
--- a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-lineitems.hbs
+++ b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-lineitems.hbs
@@ -11,9 +11,9 @@
     </tr>
   </thead>
   <tbody>
-    {{#each lineItem in lineItems}}
+    {{#each lineItems as |lineItem|}}
       <tr>
-        <td width="120"><img {{bind-attr src=lineItem.variant.images.firstObject.smallUrl}}></td>
+        <td width="120"><img src="{{lineItem.variant.images.firstObject.smallUrl}}"></td>
         <td>
           <h5>{{lineItem.variant.name}}</h5>
           <p>{{lineItem.variant.optionsText}}</p>
diff --git a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-pdp.hbs b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-pdp.hbs
index c8263e4..9bf74d1 100644
--- a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-pdp.hbs
+++ b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-pdp.hbs
@@ -17,7 +17,7 @@
       {{#if product.variants.length}}
         <div class="small-12 medium-6 columns left">
           <h3>Variants</h3>
-          {{view "select" content=product.variants optionLabelPath="content.optionsText" selection=selectedVariant}}
+          {{view 'select' content=product.variants optionLabelPath="content.optionsText" selection=selectedVariant}}
         </div>
       {{/if}}
       <div class="small-12 medium-6  columns left">
diff --git a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-properties.hbs b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-properties.hbs
index f6c96af..21b7b71 100644
--- a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-properties.hbs
+++ b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-properties.hbs
@@ -4,7 +4,7 @@
       <hr>
       <h4>Properties</h4>
       <table>
-        {{#each property in properties}}
+        {{#each properties as |property|}}
           <tr>
             <td>{{property.presentation}}</td>
             <td>{{property.value}}</td>
@@ -13,4 +13,4 @@
       </table>
     </div>
   </div>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-select.hbs b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-select.hbs
index a14c84d..7b7f7cd 100644
--- a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-select.hbs
+++ b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-select.hbs
@@ -1,10 +1,9 @@
 <label>
   {{if label label attributeName}}
-  {{view "select" content=content 
+  {{view 'select' content=content 
                   optionLabelPath=optionLabelPath 
                   selection=selection
-                  prompt=prompt
-                  classBinding="errors.length:error"}}
+                  prompt=prompt}}
               
 </label>
 {{#if errors.length}}<small class="error">{{displayErrors}}</small>{{/if}}
diff --git a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-shipment.hbs b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-shipment.hbs
index 903e81a..e57dfcd 100644
--- a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-shipment.hbs
+++ b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-shipment.hbs
@@ -4,11 +4,11 @@
       <h6>Stock Location: {{shipment.stockLocation.name}}, {{shipment.number}}</h6>
       <hr>
     </div>
-    {{#each lineItem in shipment.lineItems}}
+    {{#each shipment.lineItems as |lineItem|}}
       <div class="small-12 columns">
         <div class="row">
           <div class="small-2 columns">
-            <img {{bind-attr src=lineItem.variant.images.firstObject.smallUrl}} >
+            <img src='{{lineItem.variant.images.firstObject.smallUrl}}' >
           </div>
           <div class="small-6 columns">
             <h6>{{lineItem.variant.name}}</h6>
@@ -25,7 +25,7 @@
     {{/each}}
     <div class="small-12 columns">
       <h6>Choose a shipping Rate</h6>
-      {{view "select" content=shipment.shippingRates optionLabelPath="content.name" selection=shipment.selectedShippingRate}}
+      {{view 'select' content=shipment.shippingRates optionLabelPath="content.name" selection=shipment.selectedShippingRate}}
     </div>
   </div>
 </div>
diff --git a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-source.hbs b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-source.hbs
index aee3f85..7418e52 100644
--- a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-source.hbs
+++ b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-source.hbs
@@ -1,25 +1,30 @@
 {{spree-input value=source.number
               errors=source.errors.number
+              placeholder="Card Number"
               attributeName="Card Number"}}
               
 {{spree-input value=source.name
               errors=source.errors.name
+              placeholder="Name"
               attributeName="Name"}}
 
 <div class='row'>              
   <div class='small-4 columns'>
     {{spree-input value=source.month
                 errors=source.errors.month
+                placeholder="MM"
                 attributeName="Month"}}
   </div>
   <div class='small-4 columns'>
     {{spree-input value=source.year 
+                  placeholder="YYYY"
                   errors=source.errors.year
                   attributeName="Year"}}
   </div>
   <div class='small-4 columns'>
     {{spree-input value=source.verificationValue
                   errors=source.errors.verificationValue
+                  placeholder="Verification Value"
                   attributeName="Verification Value"}}
   </div>            
 </div>
diff --git a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-taxonomies.hbs b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-taxonomies.hbs
index 3190639..2d420ca 100644
--- a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-taxonomies.hbs
+++ b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-taxonomies.hbs
@@ -1,7 +1,7 @@
 <nav id="taxonomies" class="sidebar-item">
   <ul class="side-nav">
-    {{#each taxonomy in taxonomies}}
+    {{#each taxonomies as |taxonomy|}}
       {{spree-taxonomy taxonomy=taxonomy}}
     {{/each}}
   </ul>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-taxonomy.hbs b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-taxonomy.hbs
index a10d844..b77b127 100644
--- a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-taxonomy.hbs
+++ b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/components/spree-taxonomy.hbs
@@ -1,5 +1,5 @@
 <h4 class="taxonomy-root">{{taxonomy.prettyName}}</h4>
-{{#each taxon in childTaxons}}
+{{#each childTaxons as |taxon|}}
   <li>
     {{#link-to 'spree.taxons' taxon.permalink class='list-group-item'}}{{taxon.name}}{{/link-to}}
   </li>
diff --git a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/spree/checkout.hbs b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/spree/checkout.hbs
index a96a42f..ae3616e 100644
--- a/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/spree/checkout.hbs
+++ b/packages/storefront/blueprints/spree-ember-storefront/files/app/templates/spree/checkout.hbs
@@ -13,7 +13,7 @@
     </div>
   {{/unless}}
 
-  <div {{bind-attr class=":small-12 spree.checkouts.isInConfirm:large-12:large-8 :columns"}}>
+  <div class="small-12 columns {{if spree.checkouts.isInConfirm 'large-12' 'large-8'}}">
     {{spree-checkout}}
   </div>
 </div>

From cc993857773ad6a2aa966257111447e37126ece2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gast=C3=B3n=20I=2E=20Silva?= <givanse@gmail.com>
Date: Mon, 13 Jul 2015 04:15:52 -0500
Subject: [PATCH 09/10] [DOC] remove dev notes in favor of #90

---
 packages/checkouts/README.md  | 31 -------------------------------
 packages/storefront/README.md | 24 ------------------------
 2 files changed, 55 deletions(-)

diff --git a/packages/checkouts/README.md b/packages/checkouts/README.md
index fa983c4..56aedff 100644
--- a/packages/checkouts/README.md
+++ b/packages/checkouts/README.md
@@ -102,34 +102,3 @@ this.spree.on('didAddToCart', function(lineItem) {
 ```
 
 #### **For more information, please see the [spree-ember-checkouts API Documentation.](http://www.spree-ember.com/checkouts/index.html)**
-
-## Testing 
-
-```bash
-npm install
-bower install
-# current Ember version
-ember test
-# all supported Ember versions
-npm test
-```
-
-Note, if you serve the app to open the tests URL in a browser,
-don't forget to use the test environment.
-
-```bash
-ember serve --environment=test
-```
-
-## Contributing 
-
-In the addon folder
-```bash
-npm link
-```
-
-In your project folder
-```bash
-npm link spree-ember-storefront
-ember generate spree-ember-storefront
-```
diff --git a/packages/storefront/README.md b/packages/storefront/README.md
index 878e1f1..9e147a2 100644
--- a/packages/storefront/README.md
+++ b/packages/storefront/README.md
@@ -61,27 +61,3 @@ var app = new EmberApp({
   }
 });
 ```
-
-## Testing 
-
-```bash
-npm install
-bower install
-# current Ember version
-ember test
-# all supported Ember versions
-npm test
-```
-
-## Contributing 
-
-In the addon folder
-```bash
-npm link
-```
-
-In your project folder
-```bash
-npm link spree-ember-storefront
-ember generate spree-ember-storefront
-```

From cf7cc18ae54c1dbbeee5677efb4977eec7423501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gast=C3=B3n=20I=2E=20Silva?= <givanse@gmail.com>
Date: Mon, 13 Jul 2015 06:46:05 -0500
Subject: [PATCH 10/10] add back ENV

---
 packages/core/app/initializers/spree-ember-core.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/core/app/initializers/spree-ember-core.js b/packages/core/app/initializers/spree-ember-core.js
index dbee1ba..ae4107c 100644
--- a/packages/core/app/initializers/spree-ember-core.js
+++ b/packages/core/app/initializers/spree-ember-core.js
@@ -1,3 +1,4 @@
+import ENV from '../config/environment';
 import SpreeSerializer from 'spree-ember-core/serializers/spree';
 import SpreeAdapter from 'spree-ember-core/adapters/spree';