Return passed in value for set and setProperties in integration test

emberjs · Dec 11, 2015 · 720f080 · 720f080
1 parent b632138
commit 720f080
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/lib/ember-test-helpers/test-module-for-component.js b/lib/ember-test-helpers/test-module-for-component.js
@@ -160,15 +160,16 @@ export default TestModule.extend({
     };
 
     context.set = function(key, value) {
-      Ember.run(function() {
-        Ember.set(context, key, value);
+      return Ember.run(function() {
+        return Ember.set(context, key, value);
       });
     };
 
     context.setProperties = function(hash) {
       Ember.run(function() {
         Ember.setProperties(context, hash);
       });
+      return hash;
     };
 
     context.get = function(key) {

diff --git a/tests/test-module-for-integration-test.js b/tests/test-module-for-integration-test.js
@@ -10,7 +10,6 @@ function moduleForComponent(name, description, callbacks) {
   qunitModuleFor(module);
 }
 
-
 moduleForComponent('Component Integration Tests', {
   integration: true,
   beforeSetup: function() {
@@ -157,19 +156,22 @@ moduleForComponent('Component Integration Tests: context', {
 });
 
 test('it can set and get properties', function() {
-  this.set('foo', 1);
+  var setResult = this.set('foo', 1);
   this.render('{{my-component foo=foo}}');
+  equal(setResult, '1');
   equal(this.get('foo'), '1');
   equal(this.$('.foo').text(), '1');
 });
 
 test('it can setProperties and getProperties', function() {
-  this.setProperties({
+  var hash = {
     foo: 1,
     bar: 2
-  });
+  };
+  var setResult = this.setProperties(hash);
   this.render('{{my-component foo=foo bar=bar}}');
   var properties = this.getProperties('foo', 'bar');
+  deepEqual(setResult, hash);
   equal(properties.foo, '1');
   equal(properties.bar, '2');
   equal(this.$('.foo').text(), '1');