cf 1.1.4 → 2.0.0

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

@@ -6,13 +6,15 @@ module CF
       let(:global) { {:color => false, :quiet => true} }
       let(:inputs) { {} }
       let(:given) { {} }
-      let(:organizations) { fake_list(:organization, 3) }
-      let(:client) { fake_client(:organizations => organizations) }
+
       let(:new_name) { "some-new-name" }
+      let(:organizations) { [build(:organization)] }
+      let(:client) { build(:client) }
 
       before do
         CF::CLI.any_instance.stub(:client).and_return(client)
         CF::CLI.any_instance.stub(:precondition).and_return(nil)
+        client.stub(:organizations).and_return(organizations)
       end
 
       subject { Mothership.new.invoke(:rename_org, inputs, given, global) }
@@ -66,8 +68,8 @@ module CF
 
         context "when the defaults are used" do
           it "asks for the organization and new name and renames" do
-            mock_ask("Rename which organization?", anything) { renamed_organization }
-            mock_ask("New name") { new_name }
+            should_ask("Rename which organization?", anything) { renamed_organization }
+            should_ask("New name") { new_name }
             renamed_organization.should_receive(:name=).with(new_name)
             renamed_organization.should_receive(:update!)
             subject
@@ -79,7 +81,7 @@ module CF
 
           it "asks for the new name and renames" do
             dont_allow_ask("Rename which organization?", anything)
-            mock_ask("New name") { new_name }
+            should_ask("New name") { new_name }
             renamed_organization.should_receive(:name=).with(new_name)
             renamed_organization.should_receive(:update!)
             subject

data/spec/cf/cli/populators/organization_spec.rb

@@ -8,14 +8,14 @@ module CF
       describe "#populate_and_save!" do
         let(:tokens_file_path) { CF::TOKENS_FILE }
         let(:user) { build(:user) }
+        let(:client) { build(:client) }
         let(:organizations) do
           [
-            double(:organization, :name => "My Org", :guid => "organization-id-1", :users => [user]),
-            double(:organization, :name => "Other Org", :guid => "organization-id-2")
+            build(:organization, :name => "My Org", :guid => "organization-id-1", :users => [user]),
+            build(:organization, :name => "Other Org", :guid => "organization-id-2")
           ]
         end
         let(:organization) { organizations.first }
-        let(:client) { fake_client :organizations => organizations }
 
         let(:input) { {:organization => organization} }
         let(:tokens_yaml) { YAML.load_file(File.expand_path(tokens_file_path)) }
@@ -31,7 +31,7 @@ module CF
           write_token_file({:organization => "organization-id-1"})
         end
 
-        subject do
+        def execute_populate_and_save
           capture_output { populator.populate_and_save! }
         end
 
@@ -40,13 +40,13 @@ module CF
           described_class.any_instance.unstub(:client)
           populator.client.current_organization.guid.should == "organization-id-2"
 
-          subject
+          execute_populate_and_save
 
           populator.client.current_organization.guid.should == "organization-id-1"
         end
 
         it "returns the organization" do
-          subject.should == organization
+          execute_populate_and_save.should == organization
         end
 
         context "with an organization in the input" do
@@ -54,21 +54,21 @@ module CF
           before { write_token_file({:organization => "organization-id-2"}) }
 
           it "uses that organization" do
-            subject.should == organization
+            execute_populate_and_save.should == organization
           end
 
           it "should not reprompt for organization" do
             dont_allow_ask("Organization", anything)
-            subject
+            execute_populate_and_save
           end
 
           it "sets the organization in the token file" do
-            subject
+            execute_populate_and_save
             expect(tokens_yaml["https://api.some-domain.com"][:organization]).to be == "organization-id-1"
           end
 
           it "prints out that it is switching to that organization" do
-            subject
+            execute_populate_and_save
             expect(output).to say("Switching to organization #{organization.name}")
           end
 
@@ -80,7 +80,7 @@ module CF
             end
 
             it "removes the space from the token file" do
-              subject
+              execute_populate_and_save
               refreshed_tokens = YAML.load_file(File.expand_path(tokens_file_path))
               expect(refreshed_tokens["https://api.some-domain.com"][:space]).to be_nil
             end
@@ -93,7 +93,7 @@ module CF
             end
 
             it "does not remove the space from the token file" do
-              subject
+              execute_populate_and_save
               expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == "should-not-be-removed"
             end
           end
@@ -106,46 +106,57 @@ module CF
           context "with an organization in the config file" do
             it "should not reprompt for organization" do
               dont_allow_ask("Organization", anything)
-              subject
+              execute_populate_and_save
             end
 
             it "sets the organization in the token file" do
-              subject
+              execute_populate_and_save
               expect(tokens_yaml["https://api.some-domain.com"][:organization]).to be == "organization-id-1"
             end
 
             context "but that organization doesn't exist anymore (not valid)" do
-              before { organization.stub(:users).and_raise(CFoundry::APIError) }
+              before do
+                client.stub(:organizations).and_return(organizations)
+                organization.stub(:users).and_raise(CFoundry::APIError)
+              end
 
               it "asks the user for an organization" do
-                mock_ask("Organization", anything) { organization }
-                subject
+                should_ask("Organization", anything) { organization }
+                execute_populate_and_save
               end
             end
           end
 
           context "without an organization in the config file" do
-            before { write_token_file({}) }
+            context "when the user has organizations" do
+              before do
+                client.stub(:organizations).and_return(organizations)
+                write_token_file({})
+              end
 
-            it "prompts for the organization" do
-              mock_ask("Organization", anything) { organization }
-              subject
+              it "prompts for the organization" do
+                should_ask("Organization", anything) { organization }
+                execute_populate_and_save
 
-              expect(output).to say("Switching to organization #{organization.name}")
-            end
+                expect(output).to say("Switching to organization #{organization.name}")
+              end
 
-            it "sets the organization in the token file" do
-              mock_ask("Organization", anything) { organization }
+              it "sets the organization in the token file" do
+                should_ask("Organization", anything) { organization }
 
-              subject
-              expect(tokens_yaml["https://api.some-domain.com"][:organization]).to be == "organization-id-1"
+                execute_populate_and_save
+                expect(tokens_yaml["https://api.some-domain.com"][:organization]).to be == "organization-id-1"
+              end
             end
 
             context "when the user has no organizations" do
-              let(:client) { fake_client :organizations => [] }
+              before do
+                client.stub(:organizations).and_return([])
+                write_token_file({})
+              end
 
               it "tells the user to create one by raising a UserFriendlyError" do
-                expect { subject }.to raise_error(CF::UserFriendlyError, /There are no organizations/)
+                expect { execute_populate_and_save }.to raise_error(CF::UserFriendlyError, /There are no organizations/)
               end
             end
           end

data/spec/cf/cli/populators/space_spec.rb

@@ -2,24 +2,22 @@ require "spec_helper"
 
 module CF
   module Populators
-
     describe Space do
       stub_home_dir_with { "#{SPEC_ROOT}/fixtures/fake_home_dirs/new" }
 
       describe "#populate_and_save!" do
-        let(:tokens_file_path) { "~/.cf/tokens.yml" }
-        let(:spaces) {
-          [double(:space, :name => "Development", :guid => "space-id-1", :developers => [user]),
-            double(:space, :name => "Staging", :guid => "space-id-2")]
-        }
-
-        let(:user) { build(:user) }
-        let(:organization) { double(:organization, :name => "My Org", :guid => "organization-id-1", :users => [user], :spaces => spaces) }
-        let(:space) { spaces.first }
-        let(:client) do
-          fake_client :organizations => [organization]
+        let(:spaces) do
+          [
+            build(:space, :name => "Development", :guid => "space-id-1", :developers => [user]),
+            build(:space, :name => "Staging", :guid => "space-id-2")
+          ]
         end
+        let(:space) { spaces.first }
+        let(:user) { build(:user) }
+        let(:client) { build(:client) }
+        let(:organization) { build(:organization, :client => client, :name => "My Org", :guid => "organization-id-1", :users => [user], :spaces => spaces) }
 
+        let(:tokens_file_path) { "~/.cf/tokens.yml" }
         let(:input_hash) { {:space => space} }
         let(:inputs) { Mothership::Inputs.new(nil, nil, input_hash) }
         let(:tokens_yaml) { YAML.load_file(File.expand_path(tokens_file_path)) }
@@ -27,13 +25,10 @@ module CF
 
         before do
           client.stub(:current_user).and_return(user)
-          client.stub(:space).and_return(space)
           described_class.any_instance.stub(:client).and_return(client)
-
-          write_token_file({:space => "space-id-1", :organization => "organization-id-1"})
         end
 
-        subject do
+        def execute_populate_and_save
           capture_output { populator.populate_and_save! }
         end
 
@@ -42,13 +37,13 @@ module CF
           described_class.any_instance.unstub(:client)
           populator.client.current_space.guid.should == "space-id-2"
 
-          subject
+          execute_populate_and_save
 
           populator.client.current_space.guid.should == "space-id-1"
         end
 
         it "returns the space" do
-          subject.should == space
+          execute_populate_and_save.should == space
         end
 
         describe "mothership input arguments" do
@@ -60,7 +55,7 @@ module CF
           end
 
           it "passes through extra arguments to the input call" do
-            subject
+            execute_populate_and_save
           end
         end
 
@@ -69,21 +64,21 @@ module CF
           before { write_token_file({:space => "space-id-2"}) }
 
           it "uses that space" do
-            subject.should == space
+            execute_populate_and_save.should == space
           end
 
           it "should not reprompt for space" do
             dont_allow_ask("Space", anything)
-            subject
+            execute_populate_and_save
           end
 
           it "sets the space in the token file" do
-            subject
+            execute_populate_and_save
             expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == "space-id-1"
           end
 
           it "prints out that it is switching to that space" do
-            subject
+            execute_populate_and_save
             expect(output).to say("Switching to space #{space.name}")
           end
         end
@@ -92,48 +87,64 @@ module CF
           let(:input_hash) { {} }
 
           context "with a space in the config file" do
+            before do
+              write_token_file({:space => space.guid, :organization => organization.guid})
+              client.stub(:space).and_return(space)
+            end
+
             it "should not reprompt for space" do
               dont_allow_ask("Space", anything)
-              subject
+              execute_populate_and_save
             end
 
             it "sets the space in the token file" do
-              subject
+              execute_populate_and_save
               expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == "space-id-1"
             end
 
             context "but that space doesn't exist anymore (not valid)" do
-              before { space.stub(:developers).and_raise(CFoundry::APIError) }
+              before do
+                space.stub(:developers).and_raise(CFoundry::APIError)
+                organization.stub(:spaces).and_return(spaces)
+              end
 
               it "asks the user for an space" do
-                mock_ask("Space", anything) { space }
-                subject
+                should_ask("Space", anything) { space }
+                execute_populate_and_save
               end
             end
           end
 
           context "without a space in the config file" do
-            before { write_token_file({}) }
+            context "when the user has spaces in that organization" do
+              before do
+                write_token_file({})
+                organization.stub(:spaces).and_return(spaces)
+              end
 
-            it "prompts for the space" do
-              mock_ask("Space", anything) { space }
-              subject
+              it "prompts for the space" do
+                should_ask("Space", anything) { space }
+                execute_populate_and_save
 
-              expect(output).to say("Switching to space #{space.name}")
-            end
+                expect(output).to say("Switching to space #{space.name}")
+              end
 
-            it "sets the space in the token file" do
-              mock_ask("Space", anything) { space }
+              it "sets the space in the token file" do
+                should_ask("Space", anything) { space }
 
-              subject
-              expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == "space-id-1"
+                execute_populate_and_save
+                expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == "space-id-1"
+              end
             end
 
             context "when the user has no spaces in that organization" do
-              let(:organization) { fake(:organization, :name => "My Org", :guid => "organization-id-1", :users => [user]) }
+              before do
+                write_token_file({})
+                organization.stub(:spaces).and_return([])
+              end
 
               it "tells the user to create one by raising a UserFriendlyError" do
-                expect { subject }.to raise_error(CF::UserFriendlyError, /There are no spaces/)
+                expect { execute_populate_and_save }.to raise_error(CF::UserFriendlyError, /There are no spaces/)
               end
             end
           end

data/spec/cf/cli/populators/target_spec.rb

@@ -8,14 +8,16 @@ module CF
         let(:organization) { double(:organization) }
         let(:space) { double(:space) }
 
-        subject { Target.new(input).populate_and_save! }
+        def execute_populate_and_save
+          Target.new(input).populate_and_save!
+        end
 
         it "uses a organization then a space populator" do
           organization.should_receive(:populate_and_save!).and_return(organization)
           space.should_receive(:populate_and_save!)
           Organization.should_receive(:new).with(input).and_return(organization)
           Space.should_receive(:new).with(input, organization).and_return(space)
-          subject
+          execute_populate_and_save
         end
       end
     end

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

@@ -6,9 +6,11 @@ describe CF::Route::Delete do
     route.stub(:delete!)
   end
 
-  let(:route) { fake(:route, :host => host_name, :domain => domain) }
-  let(:client) { fake_client :routes => [route] }
-  let(:domain) { fake(:domain, :name => domain_name) }
+  let(:client) do
+    build(:client).tap { |client| client.stub(:routes => [route]) }
+  end
+  let(:route) { build(:route, :host => host_name, :domain => domain) }
+  let(:domain) { build(:domain, :name => domain_name) }
   let(:domain_name) { "some-domain.com" }
   let(:host_name) { "some-host" }
   let(:url) { "#{host_name}.#{domain_name}" }
@@ -36,7 +38,7 @@ describe CF::Route::Delete do
     let(:command) { cf %W[delete-route #{url}] }
 
     it "prompts the user are they sure?" do
-      mock_ask("Really delete #{url}?", {:default => false}) { true }
+      should_ask("Really delete #{url}?", {:default => false}) { true }
 
       command
     end

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

@@ -7,11 +7,11 @@ module CF
         stub_client_and_precondition
       end
 
-      let(:client) { fake_client(:apps => apps, :routes => routes) }
+      let(:client) { build(:client) }
 
-      let(:app) { fake(:app, :space => space, :name => "app-name") }
-      let(:space) { fake(:space, :domains => space_domains).as_null_object }
-      let(:domain) { fake(:domain, :name => "domain-name-1").as_null_object }
+      let(:app) { build(:app, :space => space, :name => "app-name") }
+      let(:space) { build(:space, :domains => space_domains) }
+      let(:domain) { build(:domain, :name => "domain-name-1") }
 
       let(:apps) { [app] }
       let(:routes) { [] }
@@ -25,12 +25,13 @@ module CF
         context "and the domain is mapped to the space" do
           let(:space_domains) { [domain] }
 
+          before do
+            space.stub(:domain_by_name).with(domain.name).and_return(domain)
+          end
+
           context "and the route is mapped to the space" do
             let(:routes) { [route] }
-            let(:route) do
-              fake(:route, :space => space, :host => host_name,
-                :domain => domain)
-            end
+            let(:route) { build(:route, :space => space, :host => host_name, :domain => domain) }
 
             it "binds the route to the app" do
               app.should_receive(:add_route).with(route)
@@ -39,7 +40,7 @@ module CF
           end
 
           context "and the route is not mapped to the space" do
-            let(:new_route) { fake(:route) }
+            let(:new_route) { build(:route) }
 
             before do
               client.stub(:route).and_return(new_route)
@@ -76,16 +77,47 @@ module CF
       context "when an app is specified" do
         subject { cf(%W[map #{app.name} #{host_name} #{domain.name}]) }
 
-        context "and the domain is not already mapped to the space" do
-          let(:space_domains) { [] }
+        before do
+          client.stub(:apps).and_return(apps)
+          client.stub(:routes).and_return(routes)
+        end
 
-          it "indicates that the domain is invalid" do
-            subject
-            expect(error_output).to say("Unknown domain")
+        context "when a host is specified" do
+          context "and the domain is not already mapped to the space" do
+            before do
+              space.stub(:domain_by_name).with(domain.name).and_return(nil)
+            end
+
+            it "indicates that the domain is invalid" do
+              subject
+              expect(error_output).to say("Unknown domain")
+            end
           end
+
+          include_examples "mapping the route to the app"
         end
 
-        include_examples "mapping the route to the app"
+        context "when a host is not specified" do
+          let(:new_route) { build(:route) }
+          let(:host_name) { "" }
+
+          before do
+            client.stub(:route).and_return(new_route)
+            client.stub(:app_by_name).with(app.name).and_return(app)
+            client.stub(:routes_by_host).with(host_name, {:depth => 0}).and_return([new_route])
+            app.stub(:add_route)
+            space.stub(:domain_by_name).with(domain.name).and_return(domain)
+            new_route.stub(:create!)
+          end
+
+          it "creates a route with an empty string as its host" do
+            new_route.should_receive(:create!)
+            subject
+            expect(new_route.host).to eq ""
+          end
+
+          include_examples "mapping the route to the app"
+        end
       end
 
       context "when an app is not specified" do
@@ -94,36 +126,23 @@ module CF
 
         subject { cf %W[map --host #{host_name} #{domain.name}] }
 
-        before { stub_ask("Which application?", anything) { app } }
+        before do
+          client.stub(:apps).and_return(apps)
+          stub_ask("Which application?", anything) { app }
+          space.stub(:domain_by_name).with(domain.name).and_return(domain)
+          client.stub(:routes_by_host).with(host_name, {:depth => 0}).and_return(routes)
+        end
 
         it "asks for an app" do
           client.stub(:route).and_return(new_route)
           app.stub(:add_route)
           new_route.stub(:create!)
-          mock_ask("Which application?", anything) { app }
+          should_ask("Which application?", anything) { app }
           subject
         end
 
         include_examples "mapping the route to the app"
       end
-
-      context "when a host is not specified" do
-        let(:new_route) { build(:route) }
-
-        subject { cf %W[map #{app.name} #{domain.name}] }
-
-        before do
-          client.stub(:route).and_return(new_route)
-          app.stub(:add_route)
-          new_route.stub(:create!)
-        end
-
-        it "creates a route with an empty string as its host" do
-          new_route.should_receive(:create!)
-          subject
-          expect(new_route.host).to eq ""
-        end
-      end
     end
   end
 end