Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.13 #89

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

1.13 #89

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/auth/.jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
],
"browser": true,
"boss": true,
"curly": true,
"curly": false,
"debug": false,
"devel": true,
"eqeqeq": true,
Expand Down
1 change: 1 addition & 0 deletions packages/auth/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ dist/
.npmignore
**/.gitkeep
bower.json
ember-cli-build.js
Brocfile.js
testem.json
2 changes: 2 additions & 0 deletions packages/auth/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ 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

matrix:
fast_finish: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary

Expand Down
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
8 changes: 5 additions & 3 deletions packages/auth/app/initializers/spree-ember-auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
6 changes: 3 additions & 3 deletions packages/auth/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
13 changes: 13 additions & 0 deletions packages/auth/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
17 changes: 17 additions & 0 deletions packages/auth/ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -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();
};
17 changes: 9 additions & 8 deletions packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 3 additions & 2 deletions packages/auth/tests/.jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"node": false,
"browser": false,
"boss": true,
"curly": false,
"curly": true,
"debug": false,
"devel": false,
"eqeqeq": true,
Expand All @@ -47,5 +47,6 @@
"strict": false,
"white": false,
"eqnull": true,
"esnext": true
"esnext": true,
"unused": true
}
1 change: 0 additions & 1 deletion packages/auth/tests/acceptance/account-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 0 additions & 2 deletions packages/auth/tests/acceptance/signup-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
1 change: 0 additions & 1 deletion packages/auth/tests/helpers/start-app.js
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion packages/auth/tests/unit/components/spree-auth-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages/checkouts/.jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
],
"browser": true,
"boss": true,
"curly": true,
"curly": false,
"debug": false,
"devel": true,
"eqeqeq": true,
Expand Down
1 change: 1 addition & 0 deletions packages/checkouts/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ dist/
.npmignore
**/.gitkeep
bower.json
ember-cli-build.js
Brocfile.js
testem.json
3 changes: 3 additions & 0 deletions packages/checkouts/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@ 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

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:
Expand Down
16 changes: 0 additions & 16 deletions packages/checkouts/Brocfile.js

This file was deleted.

5 changes: 4 additions & 1 deletion packages/checkouts/app/initializers/spree-ember-checkouts.js
Original file line number Diff line number Diff line change
@@ -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();
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a work around for this coming soon

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👌

});
}
Expand Down
8 changes: 4 additions & 4 deletions packages/checkouts/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
13 changes: 13 additions & 0 deletions packages/checkouts/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion packages/checkouts/config/environment.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';

module.exports = function(/* environment, appConfig */) {
return { };
return {};
};
17 changes: 17 additions & 0 deletions packages/checkouts/ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -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();
};
13 changes: 8 additions & 5 deletions packages/checkouts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 3 additions & 2 deletions packages/checkouts/tests/.jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"node": false,
"browser": false,
"boss": true,
"curly": false,
"curly": true,
"debug": false,
"devel": false,
"eqeqeq": true,
Expand All @@ -47,5 +47,6 @@
"strict": false,
"white": false,
"eqnull": true,
"esnext": true
"esnext": true,
"unused": true
}
2 changes: 1 addition & 1 deletion packages/checkouts/tests/acceptance/checkout-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down
1 change: 0 additions & 1 deletion packages/checkouts/tests/helpers/start-app.js
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
Loading