Merge branch 'develop' into issue49

Author: lindyhopchris

addon/components/stripe-element.js

@@ -11,11 +11,6 @@ export default Component.extend({
   stripeError: null,
   type: null, // Set in components that extend from `stripe-element`
 
-  init() {
-    this._super(...arguments);
-    set(this, 'options', {});
-  },
-
   stripev3: service(),
 
   elements: computed({
@@ -32,7 +27,7 @@ export default Component.extend({
     this._super(...arguments);
 
     // Fetch user options
-    let options = get(this, 'options');
+    let options = get(this, 'options') || {};
 
     // Fetch `type` set by child component
     let type = get(this, 'type');
@@ -65,7 +60,8 @@ export default Component.extend({
 
   didUpdateAttrs() {
     this._super(...arguments);
-    get(this, 'stripeElement').update(get(this, 'options'));
+    let options = get(this, 'options') || {};
+    get(this, 'stripeElement').update(options);
   },
 
   willDestroyElement() {

tests/dummy/config/environment.js

@@ -49,7 +49,7 @@ module.exports = function(environment) {
   }
 
   if (environment === 'production') {
-
+    // production config
   }
 
   return ENV;

tests/integration/components/stripe-card-cvc-test.js

@@ -1,12 +1,12 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
-import { render } from '@ember/test-helpers';
+import { render, find } from '@ember/test-helpers';
 import StripeMock from 'ember-stripe-elements/utils/stripe-mock';
 import env from 'dummy/config/environment';
 import StripeService from 'dummy/services/stripev3';
 
-module('Integration | Component | stripe card cvc', function(hooks) {
+module('Integration | Component | stripe-card-cvc', function(hooks) {
   setupRenderingTest(hooks);
 
   hooks.beforeEach(function() {
@@ -23,9 +23,10 @@ module('Integration | Component | stripe card cvc', function(hooks) {
     );
   });
 
-  test('it renders', async function(assert) {
+  test('it renders', async function (assert) {
     await render(hbs`{{stripe-card-cvc}}`);
 
-    assert.equal(this.element.textContent.trim(), '');
+    assert.ok(find('.ember-stripe-element.ember-stripe-card-cvc'));
+    assert.ok(find('[role="mount-point"]'));
   });
 });

tests/integration/components/stripe-card-expiry-test.js

@@ -1,12 +1,12 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
-import { render } from '@ember/test-helpers';
+import { render, find } from '@ember/test-helpers';
 import StripeMock from 'ember-stripe-elements/utils/stripe-mock';
 import env from 'dummy/config/environment';
 import StripeService from 'dummy/services/stripev3';
 
-module('Integration | Component | stripe card expiry', function(hooks) {
+module('Integration | Component | stripe-card-expiry', function(hooks) {
   setupRenderingTest(hooks);
 
   hooks.beforeEach(function() {
@@ -26,6 +26,7 @@ module('Integration | Component | stripe card expiry', function(hooks) {
   test('it renders', async function(assert) {
     await render(hbs`{{stripe-card-expiry}}`);
 
-    assert.equal(this.element.textContent.trim(), '');
+    assert.ok(find('.ember-stripe-element.ember-stripe-card-expiry'));
+    assert.ok(find('[role="mount-point"]'));
   });
 });

tests/integration/components/stripe-card-number-test.js

@@ -1,7 +1,7 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
-import { render } from '@ember/test-helpers';
+import { render, find } from '@ember/test-helpers';
 import StripeMock from 'ember-stripe-elements/utils/stripe-mock';
 import env from 'dummy/config/environment';
 import StripeService from 'dummy/services/stripev3';
@@ -26,7 +26,7 @@ module('Integration | Component | stripe card number', function(hooks) {
   test('it renders', async function(assert) {
     await render(hbs`{{stripe-card-number}}`);
 
-    assert.equal(this.element.textContent.trim(), '');
+    assert.ok(find('.ember-stripe-element.ember-stripe-card-number'));
+    assert.ok(find('[role="mount-point"]'));
   });
 });
-

tests/integration/components/stripe-card-test.js

@@ -1,12 +1,12 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
-import { render } from '@ember/test-helpers';
+import { render, find } from '@ember/test-helpers';
 import StripeMock from 'ember-stripe-elements/utils/stripe-mock';
 import env from 'dummy/config/environment';
 import StripeService from 'dummy/services/stripev3';
 
-module('Integration | Component | stripe card', function(hooks) {
+module('Integration | Component | stripe-card', function(hooks) {
   setupRenderingTest(hooks);
 
   hooks.beforeEach(function() {
@@ -24,14 +24,10 @@ module('Integration | Component | stripe card', function(hooks) {
   });
 
   test('it renders', async function(assert) {
-    // Template block usage:
-    await render(hbs`
-      {{#stripe-card}}
-        template block text
-      {{/stripe-card}}
-    `);
+    await render(hbs`{{stripe-card}}`);
 
-    assert.equal(this.element.textContent.trim(), 'template block text');
+    assert.ok(find('.ember-stripe-element.ember-stripe-card'));
+    assert.ok(find('[role="mount-point"]'));
   });
 
   test('yields out error message', async function(assert) {

tests/integration/components/stripe-postal-code-test.js

@@ -1,12 +1,12 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
-import { render } from '@ember/test-helpers';
+import { render, find } from '@ember/test-helpers';
 import StripeMock from 'ember-stripe-elements/utils/stripe-mock';
 import env from 'dummy/config/environment';
 import StripeService from 'dummy/services/stripev3';
 
-module('Integration | Component | stripe postal code', function(hooks) {
+module('Integration | Component | stripe-postal-code', function(hooks) {
   setupRenderingTest(hooks);
 
   hooks.beforeEach(function() {
@@ -26,6 +26,7 @@ module('Integration | Component | stripe postal code', function(hooks) {
   test('it renders', async function(assert) {
     await render(hbs`{{stripe-postal-code}}`);
 
-    assert.equal(this.element.textContent.trim(), '');
+    assert.ok(find('.ember-stripe-element.ember-stripe-postal-code'));
+    assert.ok(find('[role="mount-point"]'));
   });
 });