tools-cf-plugin 2.0.0 → 2.1.0

data/spec/watch_spec.rb

@@ -5,39 +5,40 @@ describe CFTools::Watch do
 
   let(:client) { fake_client :apps => [app] }
 
+  let(:payload) { "" }
+  let(:subject) { "" }
+  let(:messages) { [[payload, nil, subject]] }
+
   before { stub_client }
 
-  before do
-    stub(app).exists? { true }
-  end
+  before { app.stub(:exists? => true) }
 
   before do
-    stub(NATS).start(anything) { |_, blk| blk.call }
-    stub(NATS).subscribe
+    NATS.stub(:start).and_yield
+    NATS.stub(:subscribe).with(">") do |&blk|
+      messages.each do |msg|
+        blk.call(*msg)
+      end
+    end
   end
 
   it "subscribes all messages on NATS" do
-    mock(NATS).subscribe(">")
+    expect(NATS).to receive(:subscribe).with(">")
     cf %W[watch]
   end
 
   it "turns off output buffering" do
     # this is dumb. i know. exercise for the reader. - AS
-    any_instance_of(StringIO) do |io|
-      mock(io).sync = true
-    end
-
+    expect_any_instance_of(StringIO).to receive(:sync=).with(true)
     cf %W[watch]
   end
 
   context "when no application is given" do
     around { |example| Timecop.freeze(&example) }
 
-    it "prints a timestamp, message, and raw body" do
-      stub(NATS).subscribe(">") do |_, block|
-        block.call("some-message", nil, "some.subject")
-      end
+    let(:messages) { [["some-message", nil, "some.subject"]] }
 
+    it "prints a timestamp, message, and raw body" do
       cf %W[watch]
 
       expect(output).to say(/#{Time.now.strftime("%r")}\s*some.subject\s*some-message/)
@@ -46,7 +47,7 @@ describe CFTools::Watch do
 
   context "when no NATS server info is specified" do
     it "connects on nats:nats@127.0.0.1:4222" do
-      mock(NATS).start(hash_including(
+      expect(NATS).to receive(:start).with(hash_including(
         :uri => "nats://nats:nats@127.0.0.1:4222"))
 
       cf %W[watch]
@@ -55,7 +56,7 @@ describe CFTools::Watch do
 
   context "when NATS server info is specified" do
     it "connects to the given location using the given credentials" do
-      mock(NATS).start(hash_including(
+      expect(NATS).to receive(:start).with(hash_including(
         :uri => "nats://someuser:somepass@example.com:4242"))
 
       cf %W[watch -h example.com -P 4242 -u someuser -p somepass]
@@ -63,14 +64,10 @@ describe CFTools::Watch do
   end
 
   context "when a malformed message comes in" do
-    it "prints an error message and keeps on truckin'" do
-      stub(NATS).subscribe(">") do |_, block|
-        block.call("foo", nil, "some.subject")
-      end
+    let(:messages) { [["foo", nil, "some.subject"]] }
 
-      any_instance_of described_class do |cli|
-        stub(cli).process_message { raise "hell" }
-      end
+    it "prints an error message and keeps on truckin'" do
+      described_class.any_instance.stub(:process_message).and_raise("hell")
 
       cf %W[watch]
 
@@ -80,12 +77,14 @@ describe CFTools::Watch do
   end
 
   context "when a message comes in with a reply channel, followed by a reply" do
-    it "registers it in #requests" do
-      stub(NATS).subscribe(">") do |_, block|
-        block.call("foo", "some-reply", "some.subject")
-        block.call("some-response", nil, "some-reply")
-      end
+    let(:messages) do
+      [
+        ["foo", "some-reply", "some.subject"],
+        ["some-response", nil, "some-reply"]
+      ]
+    end
 
+    it "registers it in #requests" do
       cf %W[watch]
 
       expect(output).to say(/some\.subject             \(1\)\s*foo/)
@@ -108,11 +107,9 @@ describe CFTools::Watch do
     context "and a message containing the app's GUID is seen" do
       around { |example| Timecop.freeze(&example) }
 
-      it "prints a timestamp, message, and raw body" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call("some-message-mentioning-#{app.guid}", nil, "some.subject")
-        end
+      let(:messages) { [["some-message-mentioning-#{app.guid}", nil, "some.subject"]] }
 
+      it "prints a timestamp, message, and raw body" do
         cf %W[watch myapp]
 
         expect(output).to say(/#{Time.now.strftime("%r")}\s*some.subject\s*some-message-mentioning-#{app.guid}/)
@@ -120,11 +117,9 @@ describe CFTools::Watch do
     end
 
     context "when a message NOT containing the app's GUID is seen" do
-      it "does not print it" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call("some-irrelevant-message", nil, "some.subject")
-        end
+      let(:messages) { [["some-irrelevant-message", nil, "some.subject"]] }
 
+      it "does not print it" do
         cf %W[watch myapp]
 
         expect(output).to_not say("some.subject")
@@ -133,6 +128,8 @@ describe CFTools::Watch do
   end
 
   context "when a message is seen with subject droplet.exited" do
+    let(:subject) { "droplet.exited" }
+
     let(:payload) { <<PAYLOAD }
 {
   "exit_description": "",
@@ -147,10 +144,6 @@ describe CFTools::Watch do
 PAYLOAD
 
     it "pretty-prints the message body" do
-      stub(NATS).subscribe(">") do |_, block|
-        block.call(payload, nil, "droplet.exited")
-      end
-
       cf %W[watch]
 
       expect(output).to say("app: myapp, reason: STOPPED, index: 0")
@@ -158,6 +151,8 @@ PAYLOAD
   end
 
   context "when a message is seen with subject dea.heartbeat" do
+    let(:subject) { "dea.heartbeat" }
+
     let(:payload) { <<PAYLOAD }
 {
   "prod": false,
@@ -196,10 +191,6 @@ PAYLOAD
 
     context "and an application is given" do
       it "prints only the application's entry" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, nil, "dea.heartbeat")
-        end
-
         cf %W[watch myapp]
 
         expect(output).to say("dea: 1, running: 1, crashed: 1")
@@ -208,24 +199,13 @@ PAYLOAD
   end
 
   context "when a message is seen with subject dea.advertise" do
-    context "and app is given" do
-      it "prints nothing" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call("whatever-#{app.guid}", nil, "dea.advertise")
-        end
-
-        cf %W[watch myapp]
-
-        expect(output).to_not say("dea.advertise")
-      end
-    end
+    let(:subject) { "dea.advertise" }
 
-    context "and app is NOT given" do
-      let(:other_app) { fake :app, :name => "otherapp", :guid => "otherguid" }
+    let(:other_app) { fake :app, :name => "otherapp", :guid => "otherguid" }
 
-      let(:client) { fake_client :apps => [app, other_app] }
+    let(:client) { fake_client :apps => [app, other_app] }
 
-      let(:payload) { <<PAYLOAD }
+    let(:payload) { <<PAYLOAD }
 {
   "app_id_to_count": {
     "#{app.guid}": 1,
@@ -240,24 +220,50 @@ PAYLOAD
 }
 PAYLOAD
 
+    context "and app is given" do
+      it "prints nothing" do
+        cf %W[watch myapp]
+
+        expect(output).to_not say("dea.advertise")
+      end
+    end
+
+    context "and app is NOT given" do
       before do
-        stub(app).exists? { true }
-        stub(other_app).exists? { false }
+        app.stub(:exists? => true)
+        other_app.stub(:exists? => false)
       end
 
       it "prints the dea, its stacks, available memory, and apps" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, nil, "dea.advertise")
-        end
-
         cf %W[watch]
 
         expect(output).to say("dea: 1, stacks: lucid64, available mem: 29G, apps: 1 x myapp, 2 x unknown")
       end
+
+      context "and it does not include app counts" do
+        let(:payload) { <<PAYLOAD }
+{
+  "available_memory": 30000,
+  "stacks": [
+    "lucid64"
+  ],
+  "prod": false,
+  "id": "1-f158dcd026d1589853846a3859faf0ea"
+}
+PAYLOAD
+
+        it "prints 'none' for the app listing" do
+          cf %W[watch]
+
+          expect(output).to say("dea: 1, stacks: lucid64, available mem: 29G, apps: none")
+        end
+      end
     end
   end
 
   context "when a message is seen with subject staging.advertise" do
+    let(:subject) { "staging.advertise" }
+
     let(:payload) { <<PAYLOAD }
 {
   "available_memory": 27264,
@@ -269,10 +275,6 @@ PAYLOAD
 PAYLOAD
 
     it "prints the dea, its stacks, and its available memory" do
-      stub(NATS).subscribe(">") do |_, block|
-        block.call(payload, nil, "staging.advertise")
-      end
-
       cf %W[watch]
 
       expect(output).to say("dea: 1, stacks: lucid64, available mem: 27G")
@@ -280,6 +282,8 @@ PAYLOAD
   end
 
   context "when a message is seen with subject router.start" do
+    let(:subject) { "router.start" }
+
     let(:payload) { <<PAYLOAD }
 {
 "hosts": [
@@ -290,10 +294,6 @@ PAYLOAD
 PAYLOAD
 
     it "prints the hosts" do
-      stub(NATS).subscribe(">") do |_, block|
-        block.call(payload, nil, "router.start")
-      end
-
       cf %W[watch]
 
       expect(output).to say("hosts: 10.10.16.15")
@@ -301,6 +301,8 @@ PAYLOAD
   end
 
   context "when a message is seen with subject router.register" do
+    let(:subject) { "router.register" }
+
     context "when there's an associated DEA" do
       let(:payload) { <<PAYLOAD }
 {
@@ -318,10 +320,6 @@ PAYLOAD
 PAYLOAD
 
       it "prints the uris, host, and port" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, nil, "router.register")
-        end
-
         cf %W[watch]
 
         expect(output).to say("app: myapp, dea: 1, uris: my-app.com, my-app-2.com, host: 192.0.43.10, port: 61111")
@@ -342,10 +340,6 @@ PAYLOAD
 }
 PAYLOAD
       it "prints the uris, host, and port" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, nil, "router.register")
-        end
-
         cf %W[watch]
 
         expect(output).to say("uris: my-app.com, my-app-2.com, host: 192.0.43.10, port: 61111")
@@ -354,6 +348,8 @@ PAYLOAD
   end
 
   context "when a message is seen with subject router.unregister" do
+    let(:subject) { "router.unregister" }
+
     context "when there's an associated DEA" do
       let(:payload) { <<PAYLOAD }
 {
@@ -370,10 +366,6 @@ PAYLOAD
 PAYLOAD
 
       it "prints the dea, uris, host, and port" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, nil, "router.unregister")
-        end
-
         cf %W[watch]
 
         expect(output).to say("app: myapp, dea: 5, uris: my-app.com, host: 192.0.43.10, port: 61111")
@@ -394,10 +386,6 @@ PAYLOAD
 PAYLOAD
 
       it "prints the uris, host, and port" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, nil, "router.unregister")
-        end
-
         cf %W[watch]
 
         expect(output).to say("uris: my-app.com, host: 192.0.43.10, port: 61111")
@@ -406,6 +394,8 @@ PAYLOAD
   end
 
   context "when a message is seen with subject dea.*.start" do
+    let(:subject) { "dea.42-deadbeef.start" }
+
     let(:payload) { <<PAYLOAD }
 {
   "index": 2,
@@ -433,20 +423,12 @@ PAYLOAD
 PAYLOAD
 
     it "filters the uuid from the subject" do
-      stub(NATS).subscribe(">") do |_, block|
-        block.call(payload, nil, "dea.42-deadbeef.start")
-      end
-
       cf %W[watch]
 
       expect(output).to say("dea.42.start")
     end
 
     it "prints the uris, host, and port" do
-      stub(NATS).subscribe(">") do |_, block|
-        block.call(payload, nil, "dea.42-deadbeef.start")
-      end
-
       cf %W[watch]
 
       expect(output).to say("app: myapp, dea: 42, index: 2, uris: myapp.com")
@@ -454,6 +436,8 @@ PAYLOAD
   end
 
   context "when a message is seen with subject droplet.updated" do
+    let(:subject) { "droplet.updated" }
+
     let(:payload) { <<PAYLOAD }
 {
   "cc_partition": "default",
@@ -463,10 +447,6 @@ PAYLOAD
 PAYLOAD
 
     it "prints the app that was updated" do
-      stub(NATS).subscribe(">") do |_, block|
-        block.call(payload, nil, "droplet.updated")
-      end
-
       cf %W[watch]
 
       expect(output).to say("app: myapp")
@@ -475,6 +455,8 @@ PAYLOAD
   end
 
   context "when a message is seen with subject dea.stop" do
+    let(:subject) { "dea.stop" }
+
     context "and it's stopping particular indices" do
       let(:payload) { <<PAYLOAD }
 {
@@ -488,10 +470,6 @@ PAYLOAD
 PAYLOAD
 
       it "prints that it's scaling down, and the affected indices" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, nil, "dea.stop")
-        end
-
         cf %W[watch]
 
         expect(output).to say("app: myapp, scaling down indices: 1, 2")
@@ -510,10 +488,6 @@ PAYLOAD
 }
 PAYLOAD
       it "prints that it's killing extra instances" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, nil, "dea.stop")
-        end
-
         cf %W[watch]
 
         expect(output).to say("app: myapp, killing extra instances: a, b, c")
@@ -528,10 +502,6 @@ PAYLOAD
 PAYLOAD
 
       it "prints that it's killing extra instances" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, nil, "dea.stop")
-        end
-
         cf %W[watch]
 
         expect(output).to say("app: myapp, stopping application")
@@ -540,6 +510,8 @@ PAYLOAD
   end
 
   context "when a message is seen with subject dea.update" do
+    let(:subject) { "dea.update" }
+
     let(:payload) { <<PAYLOAD }
 {
   "uris": [
@@ -551,10 +523,6 @@ PAYLOAD
 PAYLOAD
 
     it "prints the index being stopped" do
-      stub(NATS).subscribe(">") do |_, block|
-        block.call(payload, nil, "dea.update")
-      end
-
       cf %W[watch]
 
       expect(output).to say("app: myapp, uris: myapp.com, myotherroute.com")
@@ -562,6 +530,8 @@ PAYLOAD
   end
 
   context "when a message is seen with subject dea.find.droplet" do
+    let(:subject) { "dea.find.droplet" }
+
     let(:payload) { <<PAYLOAD }
 {
   "version": "878318bf-64a0-4055-b79b-46871292ceb8",
@@ -594,22 +564,19 @@ PAYLOAD
 PAYLOAD
 
     it "prints the states being queried" do
-      stub(NATS).subscribe(">") do |_, block|
-        block.call(payload, nil, "dea.find.droplet")
-      end
-
       cf %W[watch]
 
       expect(output).to say("app: myapp, querying states: starting, running")
     end
 
     context "and we see the response" do
-      it "pretty-prints the response" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, "some-inbox", "dea.find.droplet")
-          block.call(response_payload, nil, "some-inbox")
-        end
+      let(:messages) do
+        [ [payload, "some-inbox", "dea.find.droplet"],
+          [response_payload, nil, "some-inbox"]
+        ]
+      end
 
+      it "pretty-prints the response" do
         cf %W[watch]
 
         expect(output).to say("reply to dea.find.droplet (1)\tdea: 1, index: 0, state: running, since: 2013-05-22 15:45:04 -0700")
@@ -618,6 +585,8 @@ PAYLOAD
   end
 
   context "when a message is seen with subject healthmanager.status" do
+    let(:subject) { "healthmanager.status" }
+
     let(:payload) { <<PAYLOAD }
 {
   "version": "50512eed-674e-4991-9ada-a583633c0cd4",
@@ -636,22 +605,19 @@ PAYLOAD
 PAYLOAD
 
     it "prints the states being queried" do
-      stub(NATS).subscribe(">") do |_, block|
-        block.call(payload, nil, "healthmanager.status")
-      end
-
       cf %W[watch]
 
       expect(output).to say("app: myapp, querying states: flapping")
     end
 
     context "and we see the response" do
-      it "pretty-prints the response" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, "some-inbox", "healthmanager.status")
-          block.call(response_payload, nil, "some-inbox")
-        end
+      let(:messages) do
+        [ [payload, "some-inbox", "healthmanager.status"],
+          [response_payload, nil, "some-inbox"]
+        ]
+      end
 
+      it "pretty-prints the response" do
         cf %W[watch]
 
         expect(output).to say("reply to healthmanager.status (1)\tindices: 1, 2")
@@ -660,7 +626,10 @@ PAYLOAD
   end
 
   context "when a message is seen with subject healthmanager.health" do
+    let(:subject) { "healthmanager.health" }
+
     let(:other_app) { fake :app, :name => "otherapp" }
+
     let(:client) { fake_client :apps => [app, other_app] }
 
     let(:payload) { <<PAYLOAD }
@@ -694,26 +663,23 @@ PAYLOAD
 }
 PAYLOAD
 
-    before { stub(other_app).exists? { true } }
+    before { other_app.stub(:exists? => true) }
 
     it "prints the apps whose health being queried" do
-      stub(NATS).subscribe(">") do |_, block|
-        block.call(payload, nil, "healthmanager.health")
-      end
-
       cf %W[watch]
 
       expect(output).to say("querying health for: myapp, otherapp")
     end
 
     context "and we see the response" do
-      it "pretty-prints the response" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, "some-inbox", "healthmanager.health")
-          block.call(response_payload, nil, "some-inbox")
-          block.call(other_response_payload, nil, "some-inbox")
-        end
+      let(:messages) do
+        [ [payload, "some-inbox", "healthmanager.health"],
+          [response_payload, nil, "some-inbox"],
+          [other_response_payload, nil, "some-inbox"]
+        ]
+      end
 
+      it "pretty-prints the response" do
         cf %W[watch]
 
         expect(output).to say("reply to healthmanager.health (1)\tapp: myapp, healthy: 2")
@@ -723,7 +689,10 @@ PAYLOAD
   end
 
   context "when a message is seen with subject dea.shutdown" do
+    let(:subject) { "dea.shutdown" }
+
     let(:other_app) { fake :app, :name => "otherapp" }
+
     let(:client) { fake_client :apps => [app, other_app] }
 
     let(:payload) { <<PAYLOAD }
@@ -740,15 +709,11 @@ PAYLOAD
 
     context "and the apps still exist" do
       before do
-        stub(app).exists? { true }
-        stub(other_app).exists? { true }
+        app.stub(:exists? => true)
+        other_app.stub(:exists? => true)
       end
 
       it "prints the DEA and affected applications" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, nil, "dea.shutdown")
-        end
-
         cf %W[watch]
 
         expect(output).to say("dea: 0, apps: 1 x myapp, 2 x otherapp")
@@ -757,15 +722,11 @@ PAYLOAD
 
     context "and an app no longer exists" do
       before do
-        stub(app).exists? { true }
-        stub(other_app).exists? { false }
+        app.stub(:exists? => true)
+        other_app.stub(:exists? => false)
       end
 
       it "prints the DEA and affected applications" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, nil, "dea.shutdown")
-        end
-
         cf %W[watch]
 
         expect(output).to say(
@@ -775,6 +736,8 @@ PAYLOAD
   end
 
   context "when a message is seen with subject cloudcontrollers.hm.requests.*" do
+    let(:subject) { "cloudcontrollers.hm.requests.default" }
+
     let(:last_updated) { Time.now }
 
     context "and it is a STOP operation" do
@@ -791,20 +754,12 @@ PAYLOAD
 PAYLOAD
 
       it "trims the subject" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, nil, "cloudcontrollers.hm.requests.default")
-        end
-
         cf %W[watch]
 
         expect(output).to say(/\s+hm\.request\s+/)
       end
 
       it "prints the operation, last updated timestamp, and instances" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, nil, "cloudcontrollers.hm.requests.default")
-        end
-
         cf %W[watch]
 
         expect(output).to say(
@@ -812,85 +767,79 @@ PAYLOAD
       end
     end
 
-    context "when a message is seen with subject *.announce" do
+    context "and it is a START operation" do
       let(:payload) { <<PAYLOAD }
 {
-  "supported_versions": [
-    "n/a"
+  "indices": [
+    1,
+    3
   ],
-  "plan": "1dolla",
-  "id": "quarters_as_a_service",
-  "capacity_unit": 1,
-  "max_capacity": 100,
-  "available_capacity": 100
+  "version": "some-version",
+  "last_updated": #{last_updated.to_i},
+  "op": "START",
+  "droplet": "#{app.guid}"
 }
 PAYLOAD
 
-      it "prints the dea, its stacks, and its available memory" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, nil, "QaaS.announce")
-        end
-
+      it "prints the operation, last updated timestamp, and instances" do
         cf %W[watch]
 
-        expect(output).to say("id: quarters_as_a_service, plan: 1dolla, supported versions: n/a, capacity: (available: 100, max: 100, unit: 1)")
+        expect(output).to say(
+          "app: myapp, operation: start, app last updated: #{last_updated}, indices: 1, 3")
       end
     end
+  end
 
-    context "when a message is seen with subject vcap.component.announce" do
-      let(:payload) { <<PAYLOAD }
+  context "when a message is seen with subject *.announce" do
+    let(:subject) { "QaaS.announce" }
+
+    let(:payload) { <<PAYLOAD }
 {
-  "start": "2013-05-24 16:45:01 +0000",
-  "credentials": [
-    "cb68328a26f68416eabbad702c542000",
-    "0e6b5ec19df10c7ba2e7f36cdf33474e"
-  ],
-  "host": "10.10.32.10:39195",
-  "uuid": "some-uuid",
-  "index": 0,
-  "type": "QaaS-Provisioner"
+"supported_versions": [
+  "n/a"
+],
+"plan": "1dolla",
+"id": "quarters_as_a_service",
+"capacity_unit": 1,
+"max_capacity": 100,
+"available_capacity": 100
 }
 PAYLOAD
 
-      it "prints the type, index, host, start time" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, nil, "vcap.component.announce")
-        end
-
-        cf %W[watch]
+    it "prints the dea, its stacks, and its available memory" do
+      cf %W[watch]
 
-        expect(output).to say("type: QaaS-Provisioner, index: 0, uuid: some-uuid, start time: 2013-05-24 16:45:01 +0000")
-      end
+      expect(output).to say("id: quarters_as_a_service, plan: 1dolla, supported versions: n/a, capacity: (available: 100, max: 100, unit: 1)")
     end
+  end
 
-    context "and it is a START operation" do
-      let(:payload) { <<PAYLOAD }
+  context "when a message is seen with subject vcap.component.announce" do
+    let(:subject) { "vcap.component.announce" }
+
+    let(:payload) { <<PAYLOAD }
 {
-  "indices": [
-    1,
-    3
-  ],
-  "version": "some-version",
-  "last_updated": #{last_updated.to_i},
-  "op": "START",
-  "droplet": "#{app.guid}"
+"start": "2013-05-24 16:45:01 +0000",
+"credentials": [
+  "cb68328a26f68416eabbad702c542000",
+  "0e6b5ec19df10c7ba2e7f36cdf33474e"
+],
+"host": "10.10.32.10:39195",
+"uuid": "some-uuid",
+"index": 0,
+"type": "QaaS-Provisioner"
 }
 PAYLOAD
 
-      it "prints the operation, last updated timestamp, and instances" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, nil, "cloudcontrollers.hm.requests.default")
-        end
-
-        cf %W[watch]
+    it "prints the type, index, host, start time" do
+      cf %W[watch]
 
-        expect(output).to say(
-          "app: myapp, operation: start, app last updated: #{last_updated}, indices: 1, 3")
-      end
+      expect(output).to say("type: QaaS-Provisioner, index: 0, uuid: some-uuid, start time: 2013-05-24 16:45:01 +0000")
     end
   end
 
   context "when a message is seen with subject vcap.component.discover" do
+    let(:subject) { "vcap.component.discover" }
+
     let(:payload) { "" }
 
     let(:response_payload) { <<PAYLOAD }
@@ -898,8 +847,8 @@ PAYLOAD
   "uptime": "0d:23h:51m:21s",
   "start": "2013-05-24 17:58:08 +0000",
   "credentials": [
-    "d34f205a31232eef040d1e39ebdd631a",
-    "701e1a68a811a1ac8c137a70db08c1a8"
+    "user",
+    "pass"
   ],
   "host": "1.2.3.4:8080",
   "uuid": "4-deadbeef",
@@ -909,25 +858,22 @@ PAYLOAD
 PAYLOAD
 
     it "prints the states being queried" do
-      stub(NATS).subscribe(">") do |_, block|
-        block.call(payload, nil, "vcap.component.discover")
-      end
-
       cf %W[watch]
 
       expect(output).to say("vcap.component.discover")
     end
 
     context "and we see the response" do
-      it "pretty-prints the response" do
-        stub(NATS).subscribe(">") do |_, block|
-          block.call(payload, "some-inbox", "vcap.component.discover")
-          block.call(response_payload, nil, "some-inbox")
-        end
+      let(:messages) do
+        [ [payload, "some-inbox", "vcap.component.discover"],
+          [response_payload, nil, "some-inbox"]
+        ]
+      end
 
+      it "pretty-prints the response" do
         cf %W[watch]
 
-        expect(output).to say("reply to vcap.component.discover (1)\ttype: DEA, index: 4, host: 1.2.3.4:8080, uptime: 0d:23h:51m:21s")
+        expect(output).to say("reply to vcap.component.discover (1)\ttype: DEA, index: 4, uri: user:pass@1.2.3.4:8080, uptime: 0d:23h:51m:21s")
       end
 
       context "and there's no uptime" do
@@ -946,11 +892,6 @@ PAYLOAD
 PAYLOAD
 
         it "does not include it in the message" do
-          stub(NATS).subscribe(">") do |_, block|
-            block.call(payload, "some-inbox", "vcap.component.discover")
-            block.call(response_payload, nil, "some-inbox")
-          end
-
           cf %W[watch]
 
           expect(output).to say("reply to vcap.component.discover (1)\ttype: login, index: 1, host: 1.2.3.4:8080")