Merge lp:~benji/juju-gui/1161000-fix-go-Next-arguments into lp:juju-gui/experimental

[Benji York]

Fix a bad event subscription and Next request args

Fixes bug 1161000.

https://codereview.appspot.com/8058043/

[Richard Harding (rharding)]

LGTM

https://codereview.appspot.com/8058043/

[Jeff Pihach (hatch)]

LGTM Thanks!

https://codereview.appspot.com/8058043/

=== modified file 'app/store/env/go.js'
--- app/store/env/go.js	2013-03-26 17:24:07 +0000
+++ app/store/env/go.js	2013-03-27 20:00:27 +0000
@@ -108,7 +108,7 @@
       // Define the default user name for this environment. It will appear as
       // predefined value in the login mask.
       this.defaultUser = 'user-admin';
-      this.on('_rpc_response', this._handleRpcResponse, this);
+      this.on('_rpc_response', this._handleRpcResponse);
     },
 
     /**
@@ -226,9 +226,8 @@
       this._send_rpc({
         Type: 'AllWatcher',
         Request: 'Next',
-        Params: {
-          Id: this._allWatcherId
-        }
+        Id: this._allWatcherId,
+        Params: {}
       }, function(data) {
         if (data.Error) {
           console.log('aiiiiie!'); // XXX
 
=== modified file 'test/test_env_go.js'
--- test/test_env_go.js	2013-03-26 17:24:07 +0000
+++ test/test_env_go.js	2013-03-27 20:00:27 +0000
@@ -863,9 +863,9 @@
       msg = conn.last_message();
       assert.equal(msg.Type, 'AllWatcher');
       assert.equal(msg.Request, 'Next');
-      assert.isTrue('Id' in msg.Params);
+      assert.isTrue('Id' in msg);
       // This response is in fact to the sent _next request.
-      assert.equal(msg.Params.Id, env._allWatcherId);
+      assert.equal(msg.Id, env._allWatcherId);
     });
 
     it('fires "_rpc_response" message after an RPC response', function(done) {
@@ -891,6 +891,11 @@
       env._handleRpcResponse(callbackData);
     });
 
+    it('the _rpc_response subscription can not have args', function() {
+      assert.equal(env.getEvent('_rpc_response')._subscribers.length, 1);
+      assert.equal(env.getEvent('_rpc_response')._subscribers.args, null);
+    });
+
   });
 
 })();