Fix failing tests

CenterForOpenScience · Aug 1, 2019 · ee87872 · ee87872
1 parent b1511c5
commit ee87872
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/lib/handbook/addon/docs/components/form-controls/demo-default/template.hbs b/lib/handbook/addon/docs/components/form-controls/demo-default/template.hbs
@@ -1,6 +1,6 @@
 <DocsDemo as |demo|>
     <demo.example @name='form-controls.demo-default.hbs'>
-        <form {{action this.submit on='submit'}}>
+        <form {{on 'submit' (prevent-default this.submit)}}>
             <FormControls
                 @changeset={{this.changeset}}
                 as |form|

diff --git a/lib/handbook/addon/docs/components/form-controls/demo-disabled/template.hbs b/lib/handbook/addon/docs/components/form-controls/demo-disabled/template.hbs
@@ -1,6 +1,6 @@
 <DocsDemo as |demo|>
     <demo.example @name='form-controls.demo-disabled.hbs'>
-        <form {{action this.submit on='submit'}}>
+        <form {{on 'submit' (prevent-default this.submit)}}>
             <FormControls
                 @changeset={{this.changeset}}
                 @disabled={{this.disabled}}

diff --git a/package.json b/package.json
@@ -130,6 +130,7 @@
     "ember-decorators": "^3.0.0",
     "ember-diff-attrs": "^0.2.1",
     "ember-engines": "https://github.com/cos-forks/ember-engines#v0.5.20+cos1",
+    "ember-event-helpers": "^0.1.0",
     "ember-export-application-global": "^2.0.0",
     "ember-faker": "^1.2.1",
     "ember-feature-flags": "^5.0.0",

diff --git a/tests/integration/components/form-controls/component-test.ts b/tests/integration/components/form-controls/component-test.ts
@@ -1,11 +1,10 @@
-import { render } from '@ember/test-helpers';
+import { click, render } from '@ember/test-helpers';
 import a11yAudit from 'ember-a11y-testing/test-support/audit';
 import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
 import { setupRenderingTest } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 import { module, test } from 'qunit';
 
-import { click } from 'ember-osf-web/tests/helpers';
 import buildChangeset from 'ember-osf-web/utils/build-changeset';
 
 import { nodeValidation } from './validation';
@@ -15,6 +14,7 @@ module('Integration | Component | form-controls', hooks => {
     setupMirage(hooks);
 
     test('it renders', async function(assert) {
+        assert.ok(true);
         const model = {
             title: '',
             description: '',
@@ -53,16 +53,15 @@ module('Integration | Component | form-controls', hooks => {
         const changeset = buildChangeset(model, nodeValidation);
         this.set('changeset', changeset);
 
-        function submit() {
-            // @ts-ignore 'changeset-validations aren't set up correctly for this to typecheck'
-            changeset.validate();
-        }
-        this.set('submit', submit);
         this.set('titleValue', '');
         this.set('descriptionValue', '');
+        this.set('submit', () => {
+            changeset.validate();
+            assert.ok(true);
+        });
 
         await render(hbs`
-            <form data-test-form {{on 'submit' this.submit}}>
+            <form data-test-form {{on 'submit' (prevent-default this.submit)}}>
                 <FormControls @changeset={{this.changeset}} as |form| >
                     <form.text
                         data-test-title-input
@@ -87,7 +86,7 @@ module('Integration | Component | form-controls', hooks => {
             </form>
         `);
         assert.dom('[data-test-form]').exists();
-        await click('[data-analytics-name="submit"]');
+        await click('[data-test-submit-button]');
         // Check that input has a validation message
         assert.dom('[data-test-title-input] .help-block').exists({ count: 1 });
         assert.dom('[data-test-description-input] .help-block').exists({ count: 1 });

diff --git a/yarn.lock b/yarn.lock
@@ -7634,6 +7634,13 @@ ember-diff-attrs@^0.2.1:
     ember-cli-version-checker "^2.1.0"
     lodash "^4.12.0"
 
+ember-event-helpers@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/ember-event-helpers/-/ember-event-helpers-0.1.0.tgz#4b7f49f136b660df21731a9e0329507c0816438e"
+  integrity sha512-JdsYPmW0g0LLKmdRGxS9lRIdtB1Swc7Asr0XmUwhkjbFY40bfB0wlQ8P2yA3YLqbP/ToShBitN62t9Cy4PTazQ==
+  dependencies:
+    ember-cli-babel "^7.7.3"
+
 ember-export-application-global@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-2.0.0.tgz#8d6d7619ac8a1a3f8c43003549eb21ebed685bd2"