Fixed double sending of onInvalid action

.travis.yml

@@ -1,28 +1,33 @@
 ---
 language: node_js
 node_js:
-  - "0.12"
+  - "4"
 
 sudo: false
 
 cache:
   directories:
     - node_modules
 
+env:
+  - EMBER_TRY_SCENARIO=default
+  - EMBER_TRY_SCENARIO=ember-release
+  - EMBER_TRY_SCENARIO=ember-beta
+  - EMBER_TRY_SCENARIO=ember-canary
+
 matrix:
   fast_finish: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
-  - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - npm config set spin false
+  - npm install -g bower
+  - npm install phantomjs-prebuilt
 
 install:
-  - npm install -g bower
-  - npm install -g phantomjs-prebuilt@2
   - npm install
   - bower install
 
 script:
-  - ember try:each
+  - ember try $EMBER_TRY_SCENARIO test --skip-cleanup

addon/components/paper-input.js

@@ -146,6 +146,8 @@ export default BaseFocusable.extend(ColorMixin, FlexMixin, {
 
   didRender() {
     this.growTextarea();
+    // setValue below ensures that the input value is the same as this.value
+    this.setValue(this.get('value'));
   },
 
   willClearRender() {
@@ -200,15 +202,23 @@ export default BaseFocusable.extend(ColorMixin, FlexMixin, {
 
   notifyInvalid() {
     let isInvalid = this.get('isInvalid');
-    if (this.get('lastIsInvalid') !== isInvalid) {
-      this.sendAction('onInvalid', this.get('isInvalid'));
-      this.set('lastIsInvalid', this.get('isInvalid'));
+    let lastIsInvalid = this.get('lastIsInvalid');
+    let isInvalidChanged = (lastIsInvalid !== isInvalid);
+    let isNotRedundant = !((lastIsInvalid === null && isInvalid) || (lastIsInvalid && isInvalid === null));
+    if (isInvalidChanged && isNotRedundant) {
+      this.sendAction('onInvalid', isInvalid);
+      this.set('lastIsInvalid', isInvalid);
     }
   },
+  setValue(value) {
+    this.$('input, textarea').val(value);
+  },
 
   actions: {
     handleInput(e) {
       this.sendAction('onChange', e.target.value);
+      // setValue below ensures that the input value is the same as this.value
+      this.setValue(this.get('value'));
       this.growTextarea();
       let inputElement = this.$('input').get(0);
       this.set('isNativeInvalid', inputElement && inputElement.validity && inputElement.validity.badInput);

addon/components/paper-select-core.js

@@ -56,10 +56,10 @@ export default PaperMenuAbstract.extend({
 
   actions: {
     selectOption(value) {
-      this.set('value', value);
+      this.get('onChange')(value);
     },
     deselectOption() {
-      this.set('value', null);
+      this.get('onChange')(null);
     }
   },
 

app/templates/components/paper-input.hbs

@@ -11,7 +11,6 @@
     class="md-input {{if isInvalid "ng-invalid"}} {{if isTouched "ng-dirty"}}"
     id={{inputElementId}}
     placeholder={{placeholder}}
-    value={{value}}
     disabled={{disabled}}
     autofocus={{autofocus}}
     onfocus={{onFocus}}
@@ -38,7 +37,6 @@
     id={{inputElementId}}
     placeholder={{placeholder}}
     type={{type}}
-    value={{value}}
     disabled={{disabled}}
     autofocus={{autofocus}}
     onfocus={{onFocus}}

app/templates/components/paper-select.hbs

@@ -6,6 +6,6 @@
   {{paper-icon icon class=icon-class}}
 {{/if}}
 
-{{#paper-select-core placeholder=placeholder value=value disabled=disabled getItems=getItems itemLabelCallback=itemLabelCallback as |items|}}
+{{#paper-select-core placeholder=placeholder value=value disabled=disabled onChange=onChange getItems=getItems itemLabelCallback=itemLabelCallback as |items|}}
   {{yield items}}
 {{/paper-select-core}}

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "ember-paper",
   "dependencies": {
-    "ember": "2.5.1",
+    "ember": "2.6.1",
     "ember-cli-shims": "0.1.1",
     "ember-cli-test-loader": "0.2.2",
     "ember-qunit-notifications": "0.1.0",

config/ember-try.js

@@ -1,3 +1,55 @@
 /*jshint node:true*/
 module.exports = {
+  scenarios: [
+    {
+      name: 'default',
+      bower: {
+        dependencies: { }
+      }
+    },
+    {
+      name: 'ember-1.13',
+      bower: {
+        dependencies: {
+          'ember': '~1.13.0'
+        },
+        resolutions: {
+          'ember': '~1.13.0'
+        }
+      }
+    },
+    {
+      name: 'ember-release',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#release'
+        },
+        resolutions: {
+          'ember': 'release'
+        }
+      }
+    },
+    {
+      name: 'ember-beta',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#beta'
+        },
+        resolutions: {
+          'ember': 'beta'
+        }
+      }
+    },
+    {
+      name: 'ember-canary',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#canary'
+        },
+        resolutions: {
+          'ember': 'canary'
+        }
+      }
+    }
+  ]
 };

package.json

@@ -23,23 +23,24 @@
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.2",
     "broccoli-static-compiler": "~0.2.1",
-    "ember-ajax": "0.7.1",
-    "ember-cli": "2.4.3",
+    "ember-ajax": "^2.0.1",
+    "ember-cli": "2.6.2",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-github-pages": "^0.1.0",
     "ember-cli-htmlbars": "^1.0.3",
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
     "ember-cli-inject-live-reload": "^1.4.0",
+    "ember-cli-jshint": "^1.0.0",
     "ember-cli-qunit": "^1.4.0",
-    "ember-cli-release": "0.2.8",
+    "ember-cli-release": "^0.2.9",
     "ember-cli-sass": "^5.2.1",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-code-snippet": "1.3.0",
     "ember-cp-validations": "2.6.1",
-    "ember-data": "^2.4.2",
+    "ember-data": "^2.6.0",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.5",
@@ -48,7 +49,6 @@
     "ember-resolver": "^2.0.3",
     "ember-suave": "2.0.1",
     "ember-transition-helper": "0.0.6",
-    "ember-try": "^0.2.2",
     "liquid-fire": "0.23.1",
     "loader.js": "^4.0.1"
   },

tests/helpers/module-for-acceptance.js

@@ -1,23 +1,26 @@
+// https://github.com/DockYard/ember-suave/issues/109
+// jscs:disable
 import { module } from 'qunit';
+import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
+const { RSVP: { Promise } } = Ember;
+
 export default function(name, options = {}) {
   module(name, {
     beforeEach() {
       this.application = startApp();
 
       if (options.beforeEach) {
-        options.beforeEach(...arguments);
+        return options.beforeEach.apply(this, arguments);
       }
     },
 
     afterEach() {
-      if (options.afterEach) {
-        options.afterEach(...arguments);
-      }
-
-      destroyApp(this.application);
+      let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
+      return Promise.resolve(afterEach).then(() => destroyApp(this.application));
     }
   });
 }
+// jscs:enable

tests/integration/components/paper-input-test.js

@@ -409,3 +409,36 @@ test('the `onChange` action is mandatory for paper-input', function(assert) {
     `);
   }, /`onChange` action/);
 });
+
+test('displayed input value matches actual input value', function(assert) {
+  assert.expect(4);
+
+  this.set('value', '');
+  this.onChange = () => {
+    this.set('value', '123');
+  };
+
+  this.render(hbs`{{paper-input onChange=onChange value=value}}`);
+
+  this.$('input, textarea').val('12345').trigger('input');
+  assert.equal(this.$('input, textarea').val(), '123', 'input value should be 123');
+  assert.equal(this.value, '123', 'component value should be 123');
+
+  this.$('input, textarea').val('abcdefg').trigger('input');
+  assert.equal(this.$('input, textarea').val(), '123', 'input values do not match');
+  assert.equal(this.value, '123', 'component value should be 123');
+
+});
+
+test('displayed input value matches actual input value with no onChange method', function(assert) {
+  assert.expect(2);
+
+  this.set('value', 'foo');
+
+  this.render(hbs`{{paper-input onChange=null value=value}}`);
+
+  this.$('input, textarea').val('12345').trigger('input');
+  assert.equal(this.$('input, textarea').val(), 'foo', 'input value should be `foo` (component value)');
+  assert.equal(this.get('value'), 'foo', 'component value should be foo');
+
+});