cf 1.1.4 → 2.0.0

data/spec/cf/cli/app/rename_spec.rb

@@ -4,7 +4,7 @@ describe CF::App::Rename do
   let(:global) { { :color => false, :quiet => true } }
   let(:inputs) { {} }
   let(:given) { {} }
-  let(:client) { fake_client }
+  let(:client) { build(:client) }
   let(:app) {}
   let(:new_name) { "some-new-name" }
 
@@ -38,6 +38,10 @@ describe CF::App::Rename do
   end
 
   context "when there are no apps" do
+    before do
+      client.stub(:apps).and_return([])
+    end
+
     context "and an app is given" do
       let(:given) { { :app => "some-app" } }
       it { expect { subject }.to raise_error(CF::UserError, "Unknown app 'some-app'.") }
@@ -49,14 +53,17 @@ describe CF::App::Rename do
   end
 
   context "when there are apps" do
-    let(:client) { fake_client(:apps => apps) }
-    let(:apps) { fake_list(:app, 2) }
+    let(:apps) { [build(:app, :client => client), build(:app, :client => client)] }
     let(:renamed_app) { apps.first }
 
+    before do
+      client.stub(:apps).and_return(apps)
+    end
+
     context "when the defaults are used" do
       it "asks for the app and new name and renames" do
-        mock_ask("Rename which application?", anything) { renamed_app }
-        mock_ask("New name") { new_name }
+        should_ask("Rename which application?", anything) { renamed_app }
+        should_ask("New name") { new_name }
         renamed_app.should_receive(:name=).with(new_name)
         renamed_app.should_receive(:update!)
         subject
@@ -68,7 +75,7 @@ describe CF::App::Rename do
 
       it "asks for the new name and renames" do
         dont_allow_ask("Rename which application?", anything)
-        mock_ask("New name") { new_name }
+        should_ask("New name") { new_name }
         renamed_app.should_receive(:name=).with(new_name)
         renamed_app.should_receive(:update!)
         subject

data/spec/cf/cli/app/scale_spec.rb

@@ -7,11 +7,16 @@ module CF
         stub_client_and_precondition
       end
 
-      let(:client) { fake_client :apps => [app] }
+      let(:client) { build(:client) }
+      let(:app) { }
+
+      before do
+        client.stub(:apps).and_return([app])
+      end
 
       context "when the --disk flag is given" do
         let(:before_value) { 512 }
-        let(:app) { fake :app, :disk_quota => before_value }
+        let(:app) { build(:app, :disk_quota => before_value) }
 
         subject { cf %W[scale #{app.name} --disk 1G] }
 
@@ -23,7 +28,7 @@ module CF
 
       context "when the --memory flag is given" do
         let(:before_value) { 512 }
-        let(:app) { fake :app, :memory => before_value }
+        let(:app) { build(:app, :memory => before_value) }
 
         subject { cf %W[scale #{app.name} --memory 1G] }
 
@@ -44,7 +49,7 @@ module CF
 
       context "when the --instances flag is given" do
         let(:before_value) { 3 }
-        let(:app) { fake :app, :total_instances => before_value }
+        let(:app) { build(:app, :total_instances => before_value) }
 
         subject { cf %W[scale #{app.name} --instances 5] }
 

data/spec/cf/cli/app/start_spec.rb

@@ -3,25 +3,28 @@ require "spec_helper"
 module CF
   module App
     describe Start do
+      let(:client) { build(:client) }
+      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])
       end
 
-      let(:client) { fake_client :apps => [app] }
-      let(:app) { fake :app }
-
-      subject { cf %W[start #{app.name}] }
+      def execute_start_app
+        cf %W[start #{app.name}]
+      end
 
       context "with an app that's already started" do
-        let(:app) { fake :app, :state => "STARTED" }
+        let(:app) { build(:app, :state => "STARTED") }
 
         it "skips starting the application" do
           app.should_not_receive(:start!)
-          subject
+          execute_start_app
         end
 
         it "says the app is already started" do
-          subject
+          execute_start_app
           expect(error_output).to say("Application #{app.name} is already started.")
         end
       end
@@ -29,28 +32,28 @@ module CF
       context "with an app that's NOT already started" do
         def self.it_says_application_is_starting
           it "says that it's starting the application" do
-            subject
+            execute_start_app
             expect(output).to say("Starting #{app.name}... OK")
           end
         end
 
         def self.it_prints_log_progress
           it "prints out the log progress" do
-            subject
+            execute_start_app
             expect(output).to say(log_text)
           end
         end
 
         def self.it_does_not_print_log_progress
           it "does not print the log progress" do
-            subject
+            execute_start_app
             expect(output).to_not say(log_text)
           end
         end
 
         def self.it_waits_for_application_to_become_healthy
           describe "waits for application to become healthy" do
-            let(:app) { fake :app, :total_instances => 2 }
+            let(:app) { build(:app, :total_instances => 2) }
 
             def after_sleep
               described_class.any_instance.stub(:sleep) { yield }
@@ -76,7 +79,7 @@ module CF
               end
 
               it "says app is started" do
-                subject
+                execute_start_app
                 expect(output).to say("Checking #{app.name}...")
                 expect(output).to say("1 running, 1 down")
                 expect(output).to say("2 running")
@@ -89,7 +92,7 @@ module CF
               end
 
               it "says the app failed to stage" do
-                subject
+                execute_start_app
                 expect(output).to say("Checking #{app.name}...")
                 expect(error_output).to say("Application failed to stage")
                 expect(output).to_not say(/\d (running|down|flapping)/)
@@ -108,7 +111,7 @@ module CF
               end
 
               it "keeps polling" do
-                subject
+                execute_start_app
                 expect(output).to say("Checking #{app.name}...")
                 expect(output).to say("Staging in progress...")
                 expect(output).to say("2 running")
@@ -123,7 +126,7 @@ module CF
               end
 
               it "says app failed to start" do
-                subject
+                execute_start_app
                 expect(output).to say("Checking #{app.name}...")
                 expect(output).to say("1 running, 1 down")
                 expect(output).to say("1 starting, 1 flapping")
@@ -203,31 +206,33 @@ module CF
         end
 
         context "when a debug mode is given" do
-          let(:mode) { "foo" }
+          let(:mode) { "some_mode" }
 
-          subject { cf %W[start #{app.name} -d #{mode}] }
+          def execute_start_app_with_mode
+            cf %W[start #{app.name} -d #{mode}]
+          end
 
           context "and the debug mode is different from the one already set" do
             it "starts the app with the given debug mode" do
-              expect { subject }.to change { app.debug }.from(nil).to("foo")
+              expect { execute_start_app_with_mode }.to change { app.debug }.from(nil).to("some_mode")
             end
           end
 
           context "and the debug mode is the same as the one already set" do
-            let(:app) { fake :app, :debug => "foo" }
+            let(:app) { build(:app, :debug => "in_debug") }
 
             it "does not set the debug mode to anything different" do
               app.should_not_receive(:debug).with(anything)
-              subject
+              execute_start_app_with_mode
             end
           end
 
           context "and the mode is given as 'none'" do
-            let(:app) { fake :app, :debug => "foo" }
+            let(:app) { build(:app, :debug => "in_debug") }
             let(:mode) { "none" }
 
             it "removes the debug mode" do
-              expect { subject }.to change { app.debug }.from("foo").to(nil)
+              expect { execute_start_app_with_mode }.to change { app.debug }.from("in_debug").to(nil)
             end
           end
 
@@ -235,7 +240,7 @@ module CF
             let(:mode) { "" }
 
             it "sets debug to 'run'" do
-              expect { subject }.to change { app.debug }.from(nil).to("run")
+              expect { execute_start_app_with_mode }.to change { app.debug }.from(nil).to("run")
             end
           end
         end

data/spec/cf/cli/app/stats_spec.rb

@@ -3,11 +3,10 @@ require "spec_helper"
 module CF
   module App
     describe Stats do
-      let(:global) { {:color => false} }
-      let(:inputs) { {:app => apps[0]} }
+      let(:global) { {} }
       let(:given) { {} }
-      let(:client) { fake_client(:apps => apps) }
-      let(:apps) { [fake(:app, :name => "basic_app")] }
+      let(:inputs) { {:app => apps[0]} }
+      let(:apps) { [build(:app)] }
 
       before do
         inputs[:app].stub(:stats) do
@@ -38,26 +37,26 @@ module CF
         capture_output { Mothership.new.invoke(:stats, inputs, given, global) }
       end
 
-      describe 'metadata' do
+      describe "metadata" do
         let(:command) { Mothership.commands[:stats] }
 
-        describe 'command' do
+        describe "command" do
           subject { command }
           its(:description) { should eq "Display application instance status" }
           it { expect(Mothership::Help.group(:apps, :info)).to include(subject) }
         end
 
-        include_examples 'inputs must have descriptions'
+        include_examples "inputs must have descriptions"
 
-        describe 'arguments' do
+        describe "arguments" do
           subject { command.arguments }
-          it 'has no arguments' do
+          it "has no arguments" do
             should eq([:name => :app, :type => :optional, :value => nil])
           end
         end
       end
 
-      it 'prints out the stats' do
+      it "prints out the stats" do
         subject
         stdout.rewind
         expect(stdout.readlines.last).to match /.*0\s+0\.0%\s+29\.9M of 288M\s+14\.9M of 256M.*/

data/spec/cf/cli/domain/map_spec.rb

@@ -8,17 +8,18 @@ module CF
       end
 
       let(:client) do
-        fake_client(
-          :current_organization => organization,
-          :current_space => space,
-          :spaces => [space],
-          :organizations => [organization],
-          :domains => domains)
+        build(:client).tap do |client|
+          client.stub(
+            :current_organization => organization,
+            :current_space => space,
+            :spaces => [space],
+            :organizations => [organization],
+            :domains => domains)
+        end
       end
-
-      let(:organization) { fake(:organization) }
-      let(:space) { fake(:space, :organization => organization) }
-      let(:domain) { fake(:domain, :name => domain_name) }
+      let(:organization) { build(:organization) }
+      let(:space) { build(:space, :organization => organization) }
+      let(:domain) { build(:domain, :name => domain_name) }
       let(:domain_name) { "some.domain.com" }
       let(:domains) { [domain] }
 
@@ -76,6 +77,7 @@ module CF
 
       context "when a domain and a space are passed" do
         subject { cf %W[map-domain #{domain.name} --space #{space.name}] }
+        before { organization.stub(:spaces).and_return([space]) }
 
         include_examples "mapping a domain to a space"
       end
@@ -123,6 +125,7 @@ module CF
 
       context "when a domain, organization, and space is passed" do
         subject { cf %W[map-domain #{domain.name} --space #{space.name} --organization #{organization.name}] }
+        before { organization.stub(:spaces).and_return([space]) }
 
         include_examples "mapping a domain to a space"
       end

data/spec/cf/cli/domain/unmap_spec.rb

@@ -8,23 +8,23 @@ module CF
       end
 
       let(:client) do
-        fake_client(
-          :current_organization => organization,
-          :current_space => space,
-          :spaces => [space],
-          :organizations => [organization],
-          :domains => [domain])
+        build(:client).tap do |client|
+          client.stub(
+            :current_space => space,
+            :spaces => [space],
+            :organizations => [organization],
+            :domains => [domain])
+        end
       end
-
-      let(:organization) { fake(:organization, :spaces => [space]) }
-      let(:space) { fake(:space) }
-      let(:domain) { fake(:domain, :name => "some.domain.com") }
+      let(:organization) { build(:organization) }
+      let(:space) { build(:space, :organization => organization) }
+      let(:domain) { build(:domain, :name => "some.domain.com") }
 
       context "when the --delete flag is given" do
         subject { cf %W[unmap-domain #{domain.name} --delete] }
 
         it "asks for a confirmation" do
-          mock_ask("Really delete #{domain.name}?", :default => false) { false }
+          should_ask("Really delete #{domain.name}?", :default => false) { false }
           domain.stub(:delete!)
           subject
         end

data/spec/cf/cli/organization/delete_spec.rb

@@ -15,10 +15,10 @@ module CF
       end
 
       describe "running the command" do
-        let(:organization) { fake(:organization, :name => "MyOrg") }
+        let(:organization) { build(:organization, :name => "MyOrg") }
         let(:organizations) { [organization] }
 
-        let(:client) { fake_client(:current_organization => organization, :organizations => organizations) }
+        let(:client) { build(:client) }
 
         subject { capture_output { cf %W[delete-org MyOrg --quiet --force] } }
 
@@ -28,6 +28,7 @@ module CF
           described_class.any_instance.stub(:check_target)
           CF::Populators::Organization.any_instance.stub(:populate_and_save!).and_return(organization)
           organization.stub(:delete!).and_return(true)
+          client.stub(:organizations).and_return(organizations)
         end
 
         context "without the force parameter" do
@@ -35,7 +36,7 @@ module CF
 
           it "confirms deletion of the organization and deletes it" do
             organization.should_receive(:delete!).with(:recursive => false) { true }
-            mock_ask("Really delete #{organization.name}?", {:default => false}) { true }
+            should_ask("Really delete #{organization.name}?", {:default => false}) { true }
 
             subject
           end
@@ -49,7 +50,12 @@ module CF
         end
 
         context "when deleting the current organization" do
-          let(:organizations) { [organization, fake(:organization)] }
+          let(:organizations) { [organization, build(:organization)] }
+
+          before do
+            client.stub(:current_organization).and_return(organization)
+          end
+
           it "invalidates the old target / client" do
             described_class.any_instance.should_receive(:invalidate_client)
             subject

data/spec/cf/cli/organization/orgs_spec.rb

@@ -8,15 +8,19 @@ module CF
       let(:given) { {} }
       let(:output) { StringIO.new }
 
-      let(:client) { fake_client(:organizations => organizations) }
-      let!(:org_1) { fake(:organization, :name => "bb_second", :spaces => fake_list(:space, 2), :domains => [fake(:domain)]) }
-      let!(:org_2) { fake(:organization, :name => "aa_first", :spaces => [fake(:space)], :domains => fake_list(:domain, 3)) }
-      let!(:org_3) { fake(:organization, :name => "cc_last", :spaces => fake_list(:space, 2), :domains => fake_list(:domain, 2)) }
+      let(:client) { build(:client) }
+      let(:space) { build(:space) }
+      let(:domain) { build(:domain) }
+      let!(:org_1) { build(:organization, :name => "bb_second", :spaces => [space], :domains => [domain]) }
+      let!(:org_2) { build(:organization, :name => "aa_first", :spaces => [space], :domains => [domain]) }
+      let!(:org_3) { build(:organization, :name => "cc_last", :spaces => [space], :domains => [domain]) }
       let(:organizations) { [org_1, org_2, org_3] }
 
       before do
         CF::CLI.any_instance.stub(:client) { client }
         CF::CLI.any_instance.stub(:precondition) { nil }
+
+        client.stub(:organizations).and_return(organizations)
       end
 
       subject do
@@ -85,6 +89,13 @@ module CF
         end
 
         context "and the full flag is not given (default is false)" do
+
+          before do
+            org_1.stub(:spaces).and_return([space])
+            org_2.stub(:spaces).and_return([space])
+            org_3.stub(:spaces).and_return([space])
+          end
+
           it "displays tabular output with names, spaces and domains" do
             subject