Update to use so-far-unreleased feature in ember-test-helpers

We can merge this to master when my PR lands and releases. emberjs/ember-test-helpers#38
ember-animation · Apr 8, 2015 · efcaad9 · efcaad9
1 parent 3bd9675
commit efcaad9
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 143 deletions.
diff --git a/tests/helpers/module-for-integration.js b/tests/helpers/module-for-integration.js
diff --git a/tests/integration/helpers/liquid-bind-test.js b/tests/integration/helpers/liquid-bind-test.js
@@ -1,10 +1,10 @@
 /* global sinon */
 import Ember from "ember";
-import moduleForIntegration from "../../helpers/module-for-integration";
-import { test } from "ember-qunit";
+import { test, moduleForComponent } from "ember-qunit";
 import QUnit from 'qunit';
 
-moduleForIntegration('Integration: liquid-bind', {
+moduleForComponent('liquid-bind', {
+  integration: true,
   teardown: function() {
     QUnit.stop();
     var tmap = this.container.lookup('service:liquid-fire-transitions');

diff --git a/tests/integration/helpers/liquid-container-test.js b/tests/integration/helpers/liquid-container-test.js
@@ -1,11 +1,11 @@
 import Ember from "ember";
-import moduleForIntegration from "../../helpers/module-for-integration";
-import { test } from "ember-qunit";
+import { test, moduleForComponent } from "ember-qunit";
 import QUnit from 'qunit';
 
 var tmap;
 
-moduleForIntegration('Integration: liquid-container', {
+moduleForComponent('liquid-container', {
+  integration: true,
   setup: function() {
     tmap = this.container.lookup('service:liquid-fire-transitions');
   },

diff --git a/tests/integration/helpers/liquid-if-test.js b/tests/integration/helpers/liquid-if-test.js
@@ -1,10 +1,10 @@
 /* global sinon */
 import Ember from "ember";
-import moduleForIntegration from "../../helpers/module-for-integration";
-import { test } from "ember-qunit";
+import { test, moduleForComponent } from "ember-qunit";
 import QUnit from 'qunit';
 
-moduleForIntegration('Integration: liquid-if', {
+moduleForComponent('liquid-if', {
+  integration: true,
   teardown: function() {
     QUnit.stop();
     var tmap = this.container.lookup('service:liquid-fire-transitions');

diff --git a/tests/integration/helpers/liquid-outlet-test.js b/tests/integration/helpers/liquid-outlet-test.js
@@ -1,11 +1,11 @@
 /* global sinon */
 import Ember from "ember";
-import moduleForIntegration from "../../helpers/module-for-integration";
-import { test } from "ember-qunit";
+import { test, moduleForComponent } from "ember-qunit";
 import { setOutletState, withTemplate } from "../../helpers/outlet";
 import QUnit from 'qunit';
 
-moduleForIntegration('Integration: liquid-outlet', {
+moduleForComponent('liquid-outlet', {
+  integration: true,
   teardown: function() {
     QUnit.stop();
     var tmap = this.container.lookup('service:liquid-fire-transitions');

diff --git a/tests/integration/helpers/liquid-spacer-test.js b/tests/integration/helpers/liquid-spacer-test.js
@@ -1,13 +1,13 @@
 /* global sinon */
 import Ember from "ember";
-import moduleForIntegration from "../../helpers/module-for-integration";
-import { test } from "ember-qunit";
+import { test, moduleForComponent } from "ember-qunit";
 import QUnit from 'qunit';
 import { testingKick } from "liquid-fire/mutation-observer";
 
 var tmap;
 
-moduleForIntegration('Integration: liquid-spacer', {
+moduleForComponent('liquid-spacer', {
+  integration: true,
   setup: function() {
     tmap = this.container.lookup('service:liquid-fire-transitions');
   },

diff --git a/tests/integration/helpers/liquid-with-test.js b/tests/integration/helpers/liquid-with-test.js
@@ -1,11 +1,11 @@
 /* global sinon */
 import Ember from "ember";
-import moduleForIntegration from "../../helpers/module-for-integration";
-import { test } from "ember-qunit";
+import { test, moduleForComponent } from "ember-qunit";
 import { setOutletState, withTemplate } from "../../helpers/outlet";
 import QUnit from "qunit";
 
-moduleForIntegration('Integration: liquid-with', {
+moduleForComponent('liquid-with', {
+  integration: true,
   teardown: function() {
     QUnit.stop();
     var tmap = this.container.lookup('service:liquid-fire-transitions');

diff --git a/tests/integration/transitions/explode-test.js b/tests/integration/transitions/explode-test.js
@@ -1,13 +1,13 @@
 /* global sinon */
 import Ember from "ember";
-import moduleForIntegration from "../../helpers/module-for-integration";
-import { test } from "ember-qunit";
+import { test, moduleForComponent } from "ember-qunit";
 import QUnit from 'qunit';
 
 var Promise = Ember.RSVP.Promise;
 var tmap;
 
-moduleForIntegration('Integration: explode transition', {
+moduleForComponent('explode transition', {
+  integration: true,
   setup: function() {
     tmap = this.container.lookup('service:liquid-fire-transitions');
   },

diff --git a/tests/integration/transitions/fly-to-test.js b/tests/integration/transitions/fly-to-test.js
@@ -1,12 +1,12 @@
 /* global sinon */
 import Ember from "ember";
-import moduleForIntegration from "../../helpers/module-for-integration";
-import { test } from "ember-qunit";
+import { test, moduleForComponent } from "ember-qunit";
 import QUnit from 'qunit';
 
 var tmap;
 
-moduleForIntegration('Integration: fly-to transition', {
+moduleForComponent('fly-to transition', {
+  integration: true,
   setup: function () {
     tmap = this.container.lookup('service:liquid-fire-transitions');
   },