Merge pull request #16015 from thoov/ember-router-test-upgrades

[CLEANUP] Convert ember-router tests to new style
emberjs · Dec 22, 2017 · 573c843 · 573c843
2 parents 47a383a + b7a2729
commit 573c843
Show file tree

Hide file tree

Showing 3 changed files with 274 additions and 298 deletions.
diff --git a/packages/ember-routing/tests/ext/controller_test.js b/packages/ember-routing/tests/ext/controller_test.js
@@ -1,59 +1,55 @@
 import { setOwner } from 'ember-utils';
-import { buildOwner } from 'internal-test-helpers';
 import { Controller } from 'ember-runtime';
-
-QUnit.module('ember-routing/ext/controller');
-
-QUnit.test('transitionToRoute considers an engine\'s mountPoint', function() {
-  expect(4);
-
-  let router = {
-    transitionTo(route) {
-      return route;
-    }
-  };
-
-  let engineInstance = buildOwner({
-    ownerOptions: {
-      routable: true,
-      mountPoint: 'foo.bar'
-    }
-  });
-
-  let controller = Controller.create({ target: router });
-  setOwner(controller, engineInstance);
-
-  strictEqual(controller.transitionToRoute('application'), 'foo.bar.application', 'properly prefixes application route');
-  strictEqual(controller.transitionToRoute('posts'), 'foo.bar.posts', 'properly prefixes child routes');
-  throws(() => controller.transitionToRoute('/posts'), 'throws when trying to use a url');
-
-  let queryParams = {};
-  strictEqual(controller.transitionToRoute(queryParams), queryParams, 'passes query param only transitions through');
-});
-
-QUnit.test('replaceRoute considers an engine\'s mountPoint', function() {
-  expect(4);
-
-  let router = {
-    replaceWith(route) {
-      return route;
-    }
-  };
-
-  let engineInstance = buildOwner({
-    ownerOptions: {
-      routable: true,
-      mountPoint: 'foo.bar'
-    }
-  });
-
-  let controller = Controller.create({ target: router });
-  setOwner(controller, engineInstance);
-
-  strictEqual(controller.replaceRoute('application'), 'foo.bar.application', 'properly prefixes application route');
-  strictEqual(controller.replaceRoute('posts'), 'foo.bar.posts', 'properly prefixes child routes');
-  throws(() => controller.replaceRoute('/posts'), 'throws when trying to use a url');
-
-  let queryParams = {};
-  strictEqual(controller.replaceRoute(queryParams), queryParams, 'passes query param only transitions through');
+import { buildOwner, moduleFor, AbstractTestCase } from 'internal-test-helpers';
+
+moduleFor('ember-routing/ext/controller', class extends AbstractTestCase {
+  ['@test transitionToRoute considers an engine\'s mountPoint'](assert) {
+    let router = {
+      transitionTo(route) {
+        return route;
+      }
+    };
+
+    let engineInstance = buildOwner({
+      ownerOptions: {
+        routable: true,
+        mountPoint: 'foo.bar'
+      }
+    });
+
+    let controller = Controller.create({ target: router });
+    setOwner(controller, engineInstance);
+
+    assert.strictEqual(controller.transitionToRoute('application'), 'foo.bar.application', 'properly prefixes application route');
+    assert.strictEqual(controller.transitionToRoute('posts'), 'foo.bar.posts', 'properly prefixes child routes');
+    assert.throws(() => controller.transitionToRoute('/posts'), 'throws when trying to use a url');
+
+    let queryParams = {};
+    assert.strictEqual(controller.transitionToRoute(queryParams), queryParams, 'passes query param only transitions through');
+  }
+
+  ['@test replaceRoute considers an engine\'s mountPoint'](assert) {
+    let router = {
+      replaceWith(route) {
+        return route;
+      }
+    };
+
+    let engineInstance = buildOwner({
+      ownerOptions: {
+        routable: true,
+        mountPoint: 'foo.bar'
+      }
+    });
+
+    let controller = Controller.create({ target: router });
+    setOwner(controller, engineInstance);
+
+    assert.strictEqual(controller.replaceRoute('application'), 'foo.bar.application', 'properly prefixes application route');
+    assert.strictEqual(controller.replaceRoute('posts'), 'foo.bar.posts', 'properly prefixes child routes');
+    assert.throws(() => controller.replaceRoute('/posts'), 'throws when trying to use a url');
+
+    let queryParams = {};
+    assert.strictEqual(controller.replaceRoute(queryParams), queryParams, 'passes query param only transitions through');
+  }
 });