Merge pull request #7 from code-corps/release-0.1.0

joshsmith · web-flow · commit 545f9aed5611 · 2017-11-11T00:29:46.000-08:00
Prepare for 0.1.0-rc
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,13 @@
 npm-debug.log*
 testem.log
 
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try
+
+.DS_Store
 .env
 
 .DS_Store
+yarn-error.log
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,9 @@
 ---
 language: node_js
 node_js:
-  - "6"
+  # we recommend testing addons with the same minimum supported node version as Ember CLI
+  # so that your addon works for all apps
+  - "4"
 
 sudo: false
 dist: trusty
@@ -23,7 +25,7 @@ env:
     - EMBER_TRY_SCENARIO=ember-lts-2.4
     - EMBER_TRY_SCENARIO=ember-lts-2.8
     - EMBER_TRY_SCENARIO=ember-lts-2.12
-    - EMBER_TRY_SCENARIO=ember-release
+    - EMBER_TRY_SCENARIO=ember-release COVERAGE=true
     - EMBER_TRY_SCENARIO=ember-beta
     - EMBER_TRY_SCENARIO=ember-canary
     - EMBER_TRY_SCENARIO=ember-default
@@ -48,5 +50,8 @@ script:
   #  to the addon's original dependency state, skipping "cleanup".
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
 
+after_script:
+  - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
+
 notifications:
   email: false
diff --git a/addon/components/stripe-element.js b/addon/components/stripe-element.js
@@ -1,12 +1,6 @@
-import Ember from 'ember';
-
-const {
-  Component,
-  get,
-  inject: { service },
-  set,
-  computed
-} = Ember;
+import Component from '@ember/component';
+import { inject as service } from '@ember/service';
+import { computed, get, set } from '@ember/object';
 
 export default Component.extend({
   classNames: ['ember-stripe-element'],
diff --git a/addon/services/stripev3.js b/addon/services/stripev3.js
@@ -1,11 +1,8 @@
 /* global Stripe */
-import Ember from 'ember';
-
-const {
-  getOwner,
-  Service,
-  setProperties
-} = Ember;
+import EmberError from '@ember/error';
+import { getOwner } from '@ember/application';
+import Service from '@ember/service';
+import { setProperties } from '@ember/object';
 
 export default Service.extend({
   init() {
@@ -14,7 +11,7 @@ export default Service.extend({
     const config = getOwner(this).resolveRegistration('config:environment');
 
     if (!config.stripe && !config.stripe.publishableKey) {
-      throw new Ember.Error('StripeService: Missing Stripe key, please set `ENV.stripe.publishableKey` in config.environment.js');
+      throw new EmberError('StripeService: Missing Stripe key, please set `ENV.stripe.publishableKey` in config.environment.js');
     }
 
     let { elements, createToken, createSource, retrieveSource, paymentRequest } = new Stripe(config.stripe.publishableKey);
diff --git a/app/initializers/ember-stripe-elements.js b/app/initializers/ember-stripe-elements.js
@@ -1,3 +1,4 @@
+import EmberError from '@ember/error';
 import config from '../config/environment';
 
 export function initialize() {
@@ -6,7 +7,7 @@ export function initialize() {
   application.register('config:ember-stripe-elements', config, { instantiate: false });
 
   if (!config.stripe && !config.stripe.publishableKey) {
-    throw new Ember.Error('StripeService: Missing Stripe key, please set `ENV.stripe.publishableKey` in config.environment.js');
+    throw new EmberError('StripeService: Missing Stripe key, please set `ENV.stripe.publishableKey` in config.environment.js');
   }
 }
 
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -1,8 +1,10 @@
 /* eslint-env node */
+'use strict';
+
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
-  var app = new EmberAddon(defaults, {
+  let app = new EmberAddon(defaults, {
     // Add options here
   });
 
diff --git a/package.json b/package.json
@@ -22,33 +22,34 @@
     "test": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^5.1.7",
-    "ember-cli-htmlbars": "^1.1.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.6"
+    "ember-cli-babel": "^6.3.0",
+    "ember-cli-htmlbars": "^2.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.4.3"
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
-    "ember-ajax": "^2.4.1",
-    "ember-cli": "2.12.0",
+    "coveralls": "^2.12.0",
+    "ember-ajax": "^3.0.0",
+    "ember-cli": "~2.14.2",
     "ember-cli-code-coverage": "0.3.11",
     "ember-cli-dependency-checker": "^1.3.0",
     "ember-cli-eslint": "^4.2.2",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^3.1.0",
-    "ember-cli-shims": "^1.0.2",
+    "ember-cli-qunit": "^4.0.0",
+    "ember-cli-shims": "^1.1.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-disable-prototype-extensions": "^1.1.0",
-    "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.6.0",
-    "ember-resolver": "^2.0.3",
+    "ember-disable-prototype-extensions": "^1.1.2",
+    "ember-export-application-global": "^2.0.0",
+    "ember-load-initializers": "^1.0.0",
+    "ember-resolver": "^4.0.0",
     "ember-sinon": "^1.0.1",
     "ember-sinon-qunit": "1.4.1",
-    "ember-source": "~2.12.0",
+    "ember-source": "~2.14.1",
     "loader.js": "^4.2.3"
   },
   "engines": {
-    "node": ">= 4"
+    "node": "^4.5 || 6.* || >= 7.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"
diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js
@@ -1,13 +1,9 @@
-import Ember from 'ember';
+import Application from '@ember/application';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-let App;
-
-Ember.MODEL_FACTORY_INJECTIONS = true;
-
-App = Ember.Application.extend({
+const App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver
diff --git a/tests/dummy/app/controllers/application.js b/tests/dummy/app/controllers/application.js
@@ -1,11 +1,6 @@
-import Ember from 'ember';
-
-const {
-  Controller,
-  get,
-  inject: { service },
-  set
-} = Ember;
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { get, set } from '@ember/object';
 
 let style = {
   style: {
@@ -38,7 +33,7 @@ export default Controller.extend({
   options: {
     style
   },
-  
+
   actions: {
     submit(stripeElement) {
       let stripe = get(this, 'stripev3');
diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js
@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 
-const Router = Ember.Router.extend({
+const Router = EmberRouter.extend({
   location: config.locationType,
   rootURL: config.rootURL
 });
diff --git a/tests/dummy/app/routes/application.js b/tests/dummy/app/routes/application.js
@@ -1,3 +1,3 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend();
+export default Route.extend();
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -1,9 +1,10 @@
 /* eslint-env node */
+'use strict';
 
 module.exports = function(environment) {
-  var ENV = {
+  let ENV = {
     modulePrefix: 'dummy',
-    environment: environment,
+    environment,
     rootURL: '/',
     locationType: 'auto',
     EmberENV: {
diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js
@@ -0,0 +1,9 @@
+/* eslint-env node */
+module.exports = {
+  browsers: [
+    'ie 9',
+    'last 1 Chrome versions',
+    'last 1 Firefox versions',
+    'last 1 Safari versions'
+  ]
+};
diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js
@@ -1,5 +1,5 @@
-import Ember from 'ember';
+import { run } from '@ember/runloop';
 
 export default function destroyApp(application) {
-  Ember.run(application, 'destroy');
+  run(application, 'destroy');
 }
diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
@@ -1,10 +1,8 @@
+import { resolve } from 'rsvp';
 import { module } from 'qunit';
-import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
-const { RSVP: { Promise } } = Ember;
-
 export default function(name, options = {}) {
   module(name, {
     beforeEach() {
@@ -17,7 +15,7 @@ export default function(name, options = {}) {
 
     afterEach() {
       let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
-      return Promise.resolve(afterEach).then(() => destroyApp(this.application));
+      return resolve(afterEach).then(() => destroyApp(this.application));
     }
   });
 }
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -1,12 +1,13 @@
-import Ember from 'ember';
+import { run } from '@ember/runloop';
+import { merge } from '@ember/polyfills';
 import Application from '../../app';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
-  let attributes = Ember.merge({}, config.APP);
-  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
+  let attributes = merge({}, config.APP);
+  attributes = merge(attributes, attrs); // use defaults, but you can override;
 
-  return Ember.run(() => {
+  return run(() => {
     let application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();
diff --git a/tests/integration/components/stripe-card-cvc-test.js b/tests/integration/components/stripe-card-cvc-test.js
@@ -6,20 +6,7 @@ moduleForComponent('stripe-card-cvc', 'Integration | Component | stripe card cvc
 });
 
 test('it renders', function(assert) {
-
-  // Set any properties with this.set('myProperty', 'value');
-  // Handle any actions with this.on('myAction', function(val) { ... });
-
   this.render(hbs`{{stripe-card-cvc}}`);
 
   assert.equal(this.$().text().trim(), '');
-
-  // Template block usage:
-  this.render(hbs`
-    {{#stripe-card-cvc}}
-      template block text
-    {{/stripe-card-cvc}}
-  `);
-
-  assert.equal(this.$().text().trim(), 'template block text');
 });
diff --git a/tests/integration/components/stripe-card-expiry-test.js b/tests/integration/components/stripe-card-expiry-test.js
@@ -6,20 +6,7 @@ moduleForComponent('stripe-card-expiry', 'Integration | Component | stripe card
 });
 
 test('it renders', function(assert) {
-
-  // Set any properties with this.set('myProperty', 'value');
-  // Handle any actions with this.on('myAction', function(val) { ... });
-
   this.render(hbs`{{stripe-card-expiry}}`);
 
   assert.equal(this.$().text().trim(), '');
-
-  // Template block usage:
-  this.render(hbs`
-    {{#stripe-card-expiry}}
-      template block text
-    {{/stripe-card-expiry}}
-  `);
-
-  assert.equal(this.$().text().trim(), 'template block text');
 });
diff --git a/tests/integration/components/stripe-card-number-test.js b/tests/integration/components/stripe-card-number-test.js
@@ -6,20 +6,7 @@ moduleForComponent('stripe-card-number', 'Integration | Component | stripe card
 });
 
 test('it renders', function(assert) {
-
-  // Set any properties with this.set('myProperty', 'value');
-  // Handle any actions with this.on('myAction', function(val) { ... });
-
   this.render(hbs`{{stripe-card-number}}`);
 
   assert.equal(this.$().text().trim(), '');
-
-  // Template block usage:
-  this.render(hbs`
-    {{#stripe-card-number}}
-      template block text
-    {{/stripe-card-number}}
-  `);
-
-  assert.equal(this.$().text().trim(), 'template block text');
 });
diff --git a/tests/integration/components/stripe-postal-code-test.js b/tests/integration/components/stripe-postal-code-test.js
@@ -6,20 +6,7 @@ moduleForComponent('stripe-postal-code', 'Integration | Component | stripe posta
 });
 
 test('it renders', function(assert) {
-
-  // Set any properties with this.set('myProperty', 'value');
-  // Handle any actions with this.on('myAction', function(val) { ... });
-
   this.render(hbs`{{stripe-postal-code}}`);
 
   assert.equal(this.$().text().trim(), '');
-
-  // Template block usage:
-  this.render(hbs`
-    {{#stripe-postal-code}}
-      template block text
-    {{/stripe-postal-code}}
-  `);
-
-  assert.equal(this.$().text().trim(), 'template block text');
 });
diff --git a/tests/test-helper.js b/tests/test-helper.js
@@ -2,5 +2,7 @@ import resolver from './helpers/resolver';
 import {
   setResolver
 } from 'ember-qunit';
+import { start } from 'ember-cli-qunit';
 
 setResolver(resolver);
+start();
diff --git a/tests/unit/initializers/ember-stripe-elements-test.js b/tests/unit/initializers/ember-stripe-elements-test.js
@@ -1,12 +1,12 @@
 /* global Stripe */
-import Ember from 'ember';
+import Application from '@ember/application';
+
+import { run } from '@ember/runloop';
 import { initialize } from 'dummy/initializers/ember-stripe-elements';
 import { module, test } from 'qunit';
 import destroyApp from '../../helpers/destroy-app';
 import sinon from 'sinon';
 
-const { Application, run } = Ember;
-
 var container, application;
 
 module('Unit | Initializer | ember stripe elements', {
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import EmberError from '@ember/error';`
`1`	`2`	`import config from '../config/environment';`
`2`	`3`
`3`	`4`	`export function initialize() {`
`@@ -6,7 +7,7 @@ export function initialize() {`
`6`	`7`	`application.register('config:ember-stripe-elements', config, { instantiate: false });`
`7`	`8`
`8`	`9`	`if (!config.stripe && !config.stripe.publishableKey) {`
`9`		- throw new Ember.Error('StripeService: Missing Stripe key, please set `ENV.stripe.publishableKey` in config.environment.js');
	`10`	+ throw new EmberError('StripeService: Missing Stripe key, please set `ENV.stripe.publishableKey` in config.environment.js');
`10`	`11`	`}`
`11`	`12`	`}`
`12`	`13`