start_spec.rb in cf-4.1.5.rc4

- old
+ new

@@ -7,10 +7,13 @@
       let(:app) { build(:app, :client => client, :name => "app-name", :guid => "app-id-1") }
 
       before do
         stub_client_and_precondition
         client.stub(:apps).and_return([app])
+
+        app.stub(:host).and_return("some_host")
+        app.stub(:domain).and_return("some_domain")
       end
 
       def execute_start_app
         cf %W[start #{app.name}]
       end
@@ -78,11 +81,11 @@
                 ]
               end
 
               it "says app is started" do
                 execute_start_app
-                expect(output).to say("Checking #{app.name}...")
+                expect(output).to say("Checking status of app '#{app.name}'...")
                 expect(output).to say("1 running, 1 down")
                 expect(output).to say("2 running")
               end
             end
 
@@ -91,11 +94,11 @@
                 app.stub(:instances) { raise CFoundry::StagingError.new("Failed to stage", 170001, nil, nil) }
               end
 
               it "says the app failed to stage" do
                 execute_start_app
-                expect(output).to say("Checking #{app.name}...")
+                expect(output).to say("Checking status of app '#{app.name}'...")
                 expect(error_output).to say("Application failed to stage")
                 expect(output).to_not say(/\d (running|down|flapping)/)
               end
             end
 
@@ -110,12 +113,11 @@
                 app.stub(:instances) { raise CFoundry::NotStaged.new("Staging is pending", 170002, nil, nil) }
               end
 
               it "keeps polling" do
                 execute_start_app
-                expect(output).to say("Checking #{app.name}...")
-                expect(output).to say("Staging in progress...")
+                expect(output).to say("Checking status of app '#{app.name}'...")
                 expect(output).to say("2 running")
               end
             end
 
             context "when any instance becomes flapping" do
@@ -125,13 +127,13 @@
                 ]
               end
 
               it "says app failed to start" do
                 execute_start_app
-                expect(output).to say("Checking #{app.name}...")
+                expect(output).to say("Checking status of app '#{app.name}'...")
                 expect(output).to say("1 running, 1 down")
                 expect(output).to say("1 starting, 1 flapping")
-                expect(error_output).to say("Application failed to start")
+                expect(error_output).to say("Push unsuccessful.")
               end
             end
           end
         end
 