Merge pull request #840 from SergeAstapov/bump-embroider-deps

Author: Robert Jackson

package.json

@@ -38,7 +38,7 @@
     ]
   },
   "dependencies": {
-    "@embroider/macros": "^0.48.1",
+    "@embroider/macros": "^1.0.0",
     "chalk": "^4.1.1",
     "cli-table3": "^0.6.0",
     "debug": "^4.2.0",
@@ -56,7 +56,7 @@
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
     "@ember/test-helpers": "2.6.0",
-    "@embroider/test-setup": "0.48.1",
+    "@embroider/test-setup": "^1.0.0",
     "auto-dist-tag": "2.1.1",
     "babel-eslint": "10.1.0",
     "codeclimate-test-reporter": "0.5.1",

tests/index.html

@@ -21,7 +21,7 @@
     {{content-for "body"}}
     {{content-for "test-body"}}
 
-    <script src="/testem.js" integrity=""></script>
+    <script src="/testem.js" integrity="" data-embroider-ignore></script>
     <script src="{{rootURL}}assets/vendor.js"></script>
     <script src="{{rootURL}}assets/test-support.js"></script>
     <script src="{{rootURL}}assets/dummy.js"></script>

tests/unit/qunit/async-iterator-test.js

@@ -6,7 +6,7 @@ import {
 } from '@embroider/macros';
 
 if (macroCondition(dependencySatisfies('ember-qunit', '*'))) {
-  let { module, test } = importSync('qunit');
+  let { module, test } = importSync('qunit').default;
 
   module('Unit | Qunit | async-iterator', {
     beforeEach() {

tests/unit/qunit/filter-test-modules-test.js

@@ -9,7 +9,7 @@ import {
 } from '@embroider/macros';
 
 if (macroCondition(dependencySatisfies('ember-qunit', '*'))) {
-  let { module, test } = importSync('qunit');
+  let { module, test } = importSync('qunit').default;
   let { setupTest } = importSync('ember-qunit');
 
   module('Unit | Qunit | filter-test-modules', function () {

tests/unit/qunit/multiple-edge-cases-test.js

@@ -5,7 +5,7 @@ import {
 } from '@embroider/macros';
 
 if (macroCondition(dependencySatisfies('ember-qunit', '*'))) {
-  let { module, test } = importSync('qunit');
+  let { module, test } = importSync('qunit').default;
 
   module('Qunit | #3: Module With Multiple Edge Case Tests');
 

tests/unit/qunit/multiple-ember-tests-test.js

@@ -5,7 +5,7 @@ import {
 } from '@embroider/macros';
 
 if (macroCondition(dependencySatisfies('ember-qunit', '*'))) {
-  let { module, test } = importSync('qunit');
+  let { module, test } = importSync('qunit').default;
   let { setupTest } = importSync('ember-qunit');
 
   module('Qunit | #1: Module-For With Multiple Tests', function (hooks) {

tests/unit/qunit/multiple-tests-test.js

@@ -5,7 +5,7 @@ import {
 } from '@embroider/macros';
 
 if (macroCondition(dependencySatisfies('ember-qunit', '*'))) {
-  let { module, test } = importSync('qunit');
+  let { module, test } = importSync('qunit').default;
 
   module('Qunit | #2: Module With Multiple Tests');
 

tests/unit/qunit/test-loader-test.js

@@ -6,12 +6,7 @@ import {
 } from '@embroider/macros';
 
 if (macroCondition(dependencySatisfies('ember-qunit', '*'))) {
-  let QUnit;
-  if (dependencySatisfies('ember-qunit', '>=5')) {
-    QUnit = importSync('qunit');
-  } else {
-    QUnit = importSync('qunit').default;
-  }
+  let QUnit = importSync('qunit').default;
 
   let { module, test } = QUnit;
 

tests/unit/qunit/testem-output-test.js

@@ -6,7 +6,7 @@ import {
 } from '@embroider/macros';
 
 if (macroCondition(dependencySatisfies('ember-qunit', '*'))) {
-  let { module, test } = importSync('qunit');
+  let { module, test } = importSync('qunit').default;
 
   module('Unit | Qunit | patch-testem-output', () => {
     test('add partition number to test name when `split` is passed', function (assert) {

tests/unit/qunit/weight-test-modules-test.js

@@ -6,7 +6,7 @@ import {
 } from '@embroider/macros';
 
 if (macroCondition(dependencySatisfies('ember-qunit', '*'))) {
-  let { module, test } = importSync('qunit');
+  let { module, test } = importSync('qunit').default;
 
   module('Unit | Qunit | weight-test-modules', () => {
     test('should sort a list of file paths by weight', function (assert) {