Correct way to write Service tests now

Author: pablobm

tests/unit/services/stripev3-test.js

@@ -1,89 +1,90 @@
-import { moduleFor, test } from 'ember-qunit';
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
 import sinon from 'sinon';
 import StripeMock from 'ember-stripe-elements/utils/stripe-mock';
 import env from 'dummy/config/environment';
 
-moduleFor('service:stripev3', 'Unit | Service | stripev3', {
-  // Specify the other units that are required for this test.
-  needs: ['config:environment'],
-  beforeEach() {
-    window.Stripe = StripeMock;
+module('Unit | Service | stripev3', function(hooks) {
+  setupTest(hooks);
 
-    this.stripe = this.subject({
+  hooks.beforeEach(function() {
+    window.Stripe = StripeMock;
+    this.subject = this.owner.factoryFor('service:stripev3').create({
       config: {
         mock: true,
         publishableKey: env.stripe.publishableKey
       }
     });
-  }
-});
+  });
 
-test('makes Stripe.elements available on the service', function(assert) {
-  assert.expect(1);
+  test('makes Stripe.elements available on the service', function(assert) {
+    assert.expect(1);
 
-  let service = this.subject();
-  let mockOptions = { locale: 'en' };
+    let service = this.subject;
+    let mockOptions = { locale: 'en' };
 
-  let elements = sinon.stub(service, 'elements').callsFake(function(options) {
-    assert.deepEqual(options, mockOptions, 'called with mock options');
+    let elements = sinon.stub(service, 'elements').callsFake(function(options) {
+      assert.deepEqual(options, mockOptions, 'called with mock options');
+    });
+
+    elements(mockOptions);
+    elements.restore();
   });
 
-  elements(mockOptions);
-  elements.restore();
-});
+  test('makes Stripe.createToken available on the service', function(assert) {
+    assert.expect(1);
 
-test('makes Stripe.createToken available on the service', function(assert) {
-  assert.expect(1);
+    let service = this.subject;
+    let mockOptions = { locale: 'en' };
 
-  let service = this.subject();
-  let mockOptions = { locale: 'en' };
+    let createToken = sinon.stub(service, 'createToken').callsFake(function(options) {
+      assert.deepEqual(options, mockOptions, 'called with mock options');
+    });
 
-  let createToken = sinon.stub(service, 'createToken').callsFake(function(options) {
-    assert.deepEqual(options, mockOptions, 'called with mock options');
+    createToken(mockOptions);
+    createToken.restore();
   });
 
-  createToken(mockOptions);
-  createToken.restore();
-});
+  test('makes Stripe.createSource available on the service', function(assert) {
+    assert.expect(1);
 
-test('makes Stripe.createSource available on the service', function(assert) {
-  assert.expect(1);
+    let service = this.subject;
+    let mockOptions = { locale: 'en' };
 
-  let service = this.subject();
-  let mockOptions = { locale: 'en' };
+    let createSource = sinon.stub(service, 'createSource').callsFake(function(options) {
+      assert.deepEqual(options, mockOptions, 'called with mock options');
+    });
 
-  let createSource = sinon.stub(service, 'createSource').callsFake(function(options) {
-    assert.deepEqual(options, mockOptions, 'called with mock options');
+    createSource(mockOptions);
+    createSource.restore();
   });
 
-  createSource(mockOptions);
-  createSource.restore();
-});
+  test('makes Stripe.retrieveSource available on the service', function(assert) {
+    assert.expect(1);
 
-test('makes Stripe.retrieveSource available on the service', function(assert) {
-  assert.expect(1);
+    let service = this.subject;
+    let mockOptions = { locale: 'en' };
 
-  let service = this.subject();
-  let mockOptions = { locale: 'en' };
+    let retrieveSource = sinon.stub(service, 'retrieveSource').callsFake(function(options) {
+      assert.deepEqual(options, mockOptions, 'called with mock options');
+    });
 
-  let retrieveSource = sinon.stub(service, 'retrieveSource').callsFake(function(options) {
-    assert.deepEqual(options, mockOptions, 'called with mock options');
+    retrieveSource(mockOptions);
+    retrieveSource.restore();
   });
 
-  retrieveSource(mockOptions);
-  retrieveSource.restore();
-});
+  test('makes Stripe.paymentRequest available on the service', function(assert) {
+    assert.expect(1);
 
-test('makes Stripe.paymentRequest available on the service', function(assert) {
-  assert.expect(1);
+    let service = this.subject;
+    let mockOptions = { locale: 'en' };
 
-  let service = this.subject();
-  let mockOptions = { locale: 'en' };
+    let paymentRequest = sinon.stub(service, 'paymentRequest').callsFake(function(options) {
+      assert.deepEqual(options, mockOptions, 'called with mock options');
+    });
 
-  let paymentRequest = sinon.stub(service, 'paymentRequest').callsFake(function(options) {
-    assert.deepEqual(options, mockOptions, 'called with mock options');
+    paymentRequest(mockOptions);
+    paymentRequest.restore();
   });
-
-  paymentRequest(mockOptions);
-  paymentRequest.restore();
 });
+