Merge pull request #693 from smile-io/renovate/major-ember-deps

Update dependency ember-qunit to v5

Author: vladucu

package.json

@@ -77,6 +77,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
+    "@ember/test-helpers": "^2.1.4",
     "@glimmer/component": "1.0.3",
     "@glimmer/tracking": "1.0.3",
     "@smile-io/changelog-generator": "2.1.0",
@@ -96,7 +97,7 @@
     "ember-export-application-global": "2.0.1",
     "ember-load-initializers": "2.1.2",
     "ember-maybe-import-regenerator": "0.1.6",
-    "ember-qunit": "4.6.0",
+    "ember-qunit": "5.1.1",
     "ember-resolver": "8.0.2",
     "ember-source": "3.24.0",
     "ember-source-channel-url": "3.0.0",
@@ -114,6 +115,7 @@
     "npm-run-all": "4.1.5",
     "precise-commits": "1.0.2",
     "prettier": "2.2.1",
+    "qunit": "^2.13.0",
     "qunit-dom": "1.6.0"
   },
   "engines": {

tests/index.html

@@ -21,6 +21,13 @@
     {{content-for "body"}}
     {{content-for "test-body"}}
 
+    <div id="qunit"></div>
+    <div id="qunit-fixture">
+      <div id="ember-testing-container">
+        <div id="ember-testing"></div>
+      </div>
+    </div>
+
     <script src="/testem.js" integrity=""></script>
     <script src="{{rootURL}}assets/vendor.js"></script>
     <script src="{{rootURL}}assets/test-support.js"></script>

tests/integration/components/polaris-banner-test.js

@@ -296,7 +296,7 @@ module('Integration | Component | polaris banner', function (hooks) {
   });
 
   test('it supports `primaryAction` and `secondaryAction`', async function (assert) {
-    assert.expect(13);
+    assert.expect(14);
 
     await render(hbs`{{polaris-banner text="Some content text"}}`);
 
@@ -396,6 +396,11 @@ module('Integration | Component | polaris banner', function (hooks) {
       'banner with actions - renders correct `secondaryAction` button text'
     );
 
+    this.setProperties({
+      mainActionLoading: false,
+      mainActionDisabled: false,
+    });
+
     await click(primaryActionBtnSelector);
     await click(secondaryActionBtnSelector);
   });

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

@@ -344,14 +344,11 @@ module('Integration | Component | polaris card', function (hooks) {
       'clicking second action button - invokes second action handler correctly'
     );
 
-    await click(actionButtons[2]);
-    assert.equal(
-      this.get('action3HandlerCalled'),
-      false,
-      'clicking disabled third action button - does not invoke third action handler'
-    );
     assert
       .dom(actionButtons[2])
+      .isDisabled(
+        'third action is a disabled header action - button is disabled'
+      )
       .hasClass(
         'Polaris-Button--disabled',
         'third action is a disabled header action - disabled class'

tests/integration/components/polaris-date-picker-test.js

@@ -380,16 +380,11 @@ module('Integration | Component | polaris date picker', function (hooks) {
     const DISABLE_AFTER = new Date('Mon Feb 12 2018 00:00:00 GMT-0500 (EST)');
     const DISABLE_AFTER_SELECTOR = '[aria-label="February 13 2018"]';
 
-    this.set('onChangeActionFired', false);
-
     this.setProperties({
       month: MONTH,
       year: YEAR,
       selected: null,
       disableDatesAfter: DISABLE_AFTER,
-      onChange: () => {
-        this.set('onChangeActionFired', true);
-      },
     });
 
     await render(hbs`
@@ -398,15 +393,12 @@ module('Integration | Component | polaris date picker', function (hooks) {
         year=year
         selected=selected
         disableDatesAfter=disableDatesAfter
-        onChange=(action onChange)
       }}
     `);
 
-    await click(DISABLE_AFTER_SELECTOR);
-    assert.notOk(
-      this.get('onChangeActionFired'),
-      'clicking disabled day did not fire `onChange` action'
-    );
+    assert
+      .dom(DISABLE_AFTER_SELECTOR)
+      .isDisabled('disabled day is rendered correctly');
   });
 
   test('it applies an `inRange` class to days between the selected range', async function (assert) {

tests/integration/components/polaris-option-list/option-test.js

@@ -70,7 +70,7 @@ module(
       await click('button');
     });
 
-    test('doesn’t call onClick if option is disabled', async function (assert) {
+    test('supports option being disabled', async function (assert) {
       await render(hbs`
       {{polaris-option-list/option
         optionId=defaultProps.id
@@ -83,9 +83,7 @@ module(
       }}
     `);
 
-      await click('button');
-
-      assert.notOk(this.get('wasOnClickCalled'));
+      assert.dom('button').isDisabled();
     });
 
     test('calls onClick with section and index if option is not disabled and multiple options are allowed', async function (assert) {
@@ -112,25 +110,6 @@ module(
       await triggerEvent('input', 'change');
     });
 
-    test('doesn’t call onClick if option is disabled and multiple options are allowed', async function (assert) {
-      await render(hbs`
-      {{polaris-option-list/option
-        optionId=defaultProps.id
-        label=defaultProps.label
-        value=defaultProps.value
-        section=defaultProps.section
-        index=defaultProps.index
-        onClick=(action (mut wasOnClickCalled) true)
-        disabled=true
-        allowMultiple=true
-      }}
-    `);
-
-      await triggerEvent('input', 'change');
-
-      assert.notOk(this.get('wasOnClickCalled'));
-    });
-
     test('sets the pass through props for Checkbox if multiple items are allowed', async function (assert) {
       await render(hbs`
       {{polaris-option-list/option

tests/test-helper.js

@@ -2,6 +2,10 @@ import Application from 'dummy/app';
 import config from 'dummy/config/environment';
 import { setApplication } from '@ember/test-helpers';
 import { start } from 'ember-qunit';
+import * as QUnit from 'qunit';
+import { setup } from 'qunit-dom';
+
+setup(QUnit.assert);
 
 setApplication(Application.create(config.APP));