cf 1.1.3.rc1 → 1.1.4

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

@@ -1,108 +1,107 @@
-require 'spec_helper'
-require "cf/cli/space/delete"
-
-describe CF::Space::Delete do
-  describe 'metadata' do
-    let(:command) { Mothership.commands[:delete_space] }
-
-    describe 'command' do
-      subject { command }
-      its(:description) { should eq "Delete a space and its contents" }
-      it { expect(Mothership::Help.group(:spaces)).to include(subject) }
-    end
-
-    include_examples 'inputs must have descriptions'
-  end
-
-  describe "running the command" do
-    let(:space) { fake :space, :name => "some_space_name" }
-    let(:organization) { fake(:organization, :spaces => [space], :name => "MyOrg") }
-    let(:client) { fake_client(:current_organization => organization, :spaces => [space]) }
-
-    subject { capture_output { cf %W[delete-space some_space_name --quiet --force] } }
-
-    before do
-      any_instance_of described_class do |cli|
-        stub(cli).client { client }
+require "spec_helper"
+
+module CF
+  module Space
+    describe Delete do
+      describe "metadata" do
+        let(:command) { Mothership.commands[:delete_space] }
+
+        describe "command" do
+          subject { command }
+          its(:description) { should eq "Delete a space and its contents" }
+          it { expect(Mothership::Help.group(:spaces)).to include(subject) }
+        end
 
-        stub(cli).check_logged_in
-        stub(cli).check_target
-        any_instance_of(CF::Populators::Organization, :populate_and_save! => organization)
+        include_examples "inputs must have descriptions"
       end
-      stub(space).delete!
-    end
 
+      describe "running the command" do
+        let(:space) { fake :space, :name => "some_space_name" }
+        let(:organization) { fake(:organization, :spaces => [space], :name => "MyOrg") }
+        let(:client) { fake_client(:current_organization => organization, :spaces => [space]) }
 
-    context "without the force parameter when prompting" do
-      subject { cf %W[delete-space some_space_name --quiet] }
-      context "when the user responds 'y'" do
-        it "deletes the space, exits cleanly" do
-          mock(space).delete!
-          mock_ask("Really delete #{space.name}?", {:default => false}) { true }
+        subject { capture_output { cf %W[delete-space some_space_name --quiet --force] } }
 
-          subject
-          @status.should == 0
+        before do
+          described_class.any_instance.stub(:client) { client }
+          described_class.any_instance.stub(:precondition)
+          CF::Populators::Organization.any_instance.stub(:populate_and_save!).and_return(organization)
+          space.stub(:delete!)
         end
-      end
 
-      context "when the user responds 'n'" do
-        it "exits cleanly without deleting the space" do
-          dont_allow(space).delete!
-          mock_ask("Really delete #{space.name}?", {:default => false}) { false }
 
-          subject
-          @status.should == 0
-        end
-      end
-    end
+        context "without the force parameter when prompting" do
+          subject { cf %W[delete-space some_space_name --quiet] }
+          context "when the user responds 'y'" do
+            it "deletes the space, exits cleanly" do
+              space.should_receive(:delete!)
+              mock_ask("Really delete #{space.name}?", {:default => false}) { true }
 
-    context "when deleting the current space" do
-      before do
-        stub(client).current_space { space }
-      end
+              subject
+              @status.should == 0
+            end
+          end
 
-      it "warns the user what they've done" do
-        subject
-        expect(output).to say("The space that you were targeting has now been deleted. Please use `cf target -s SPACE_NAME` to target a different one.")
-      end
+          context "when the user responds 'n'" do
+            it "exits cleanly without deleting the space" do
+              space.should_not_receive(:delete!)
+              mock_ask("Really delete #{space.name}?", {:default => false}) { false }
 
-      context "when the current space has dependent objects" do
-        before do
-          stub(space).delete! { raise CFoundry::AssociationNotEmpty.new("We don't delete children.", 10006) }
+              subject
+              @status.should == 0
+            end
+          end
         end
 
-        it "does not print a success message" do
-          subject
-          expect(output).to_not say("The space that you were targeting has now been deleted")
+        context "when deleting the current space" do
+          before do
+            client.stub(:current_space) { space }
+          end
+
+          it "warns the user what they've done" do
+            subject
+            expect(output).to say("The space that you were targeting has now been deleted. Please use `cf target -s SPACE_NAME` to target a different one.")
+          end
+
+          context "when the current space has dependent objects" do
+            before do
+              space.stub(:delete!) { raise CFoundry::AssociationNotEmpty.new("We don't delete children.", 10006) }
+            end
+
+            it "does not print a success message" do
+              subject
+              expect(output).to_not say("The space that you were targeting has now been deleted")
+            end
+          end
         end
-      end
-    end
 
-    context "when a space fails to delete" do
-      before do
-        stub(space).delete! { raise CFoundry::AssociationNotEmpty.new("We don't delete children.", 10006) }
-        subject
-      end
+        context "when a space fails to delete" do
+          before do
+            space.stub(:delete!) { raise CFoundry::AssociationNotEmpty.new("We don't delete children.", 10006) }
+            subject
+          end
 
-      it "shows the error message" do
-        expect(output).to say "We don't delete children."
-      end
+          it "shows the error message" do
+            expect(output).to say "We don't delete children."
+          end
 
-      it "informs the user of how to recursively delete" do
-        expect(output).to say "If you want to delete the space along with all dependent objects, rerun the command with the '--recursive' flag."
-      end
+          it "informs the user of how to recursively delete" do
+            expect(output).to say "If you want to delete the space along with all dependent objects, rerun the command with the '--recursive' flag."
+          end
 
-      it "returns a non-zero exit code" do
-        @status.should_not == 0
-      end
-    end
+          it "returns a non-zero exit code" do
+            @status.should_not == 0
+          end
+        end
 
-    context "when deleting with --recursive" do
-      subject { cf %W[delete-space some_space_name --recursive --force] }
+        context "when deleting with --recursive" do
+          subject { cf %W[delete-space some_space_name --recursive --force] }
 
-      it "sends recursive true in its delete request" do
-        mock(space).delete!(:recursive => true)
-        subject
+          it "sends recursive true in its delete request" do
+            space.should_receive(:delete!).with(:recursive => true)
+            subject
+          end
+        end
       end
     end
   end

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

@@ -1,103 +1,102 @@
-require 'spec_helper'
-require "cf/cli/space/rename"
-
-describe CF::Space::Rename do
-  let(:spaces) { fake_list(:space, 3) }
-  let(:organization) { fake(:organization, :spaces => spaces) }
-  let(:client) { fake_client(:current_organization => organization, :spaces => spaces) }
-  let(:new_name) { "some-new-name" }
-
-  before do
-    any_instance_of described_class do |cli|
-      stub(cli).client { client }
-
-      stub(cli).check_logged_in
-      stub(cli).check_target
-      any_instance_of(CF::Populators::Organization, :populate_and_save! => organization)
-    end
-  end
-
-  describe 'metadata' do
-    let(:command) { Mothership.commands[:rename_space] }
-
-    describe 'command' do
-      subject { command }
-      its(:description) { should eq "Rename a space" }
-      it { expect(Mothership::Help.group(:spaces)).to include(subject) }
-    end
-
-    include_examples 'inputs must have descriptions'
-
-    describe 'arguments' do
-      subject { command.arguments }
-      it 'has the correct argument order' do
-        should eq([
-          {:type => :optional, :value => nil, :name => :space},
-          {:type => :optional, :value => nil, :name => :name}
-        ])
-      end
-    end
-  end
-
-  context 'when there are no spaces' do
-    let(:spaces) { [] }
-
-    context 'and a space is given' do
-      subject { cf %W[rename-space --space some-invalid-space --no-force --no-quiet] }
-      it 'prints out an error message' do
-        subject
-        expect(stderr.string).to include "Unknown space 'some-invalid-space'."
+require "spec_helper"
+
+module CF
+  module Space
+    describe Rename do
+      let(:spaces) { fake_list(:space, 3) }
+      let(:organization) { fake(:organization, :spaces => spaces) }
+      let(:client) { fake_client(:current_organization => organization, :spaces => spaces) }
+      let(:new_name) { "some-new-name" }
+
+      before do
+        described_class.any_instance.stub(:client) { client }
+        described_class.any_instance.stub(:precondition)
+        CF::Populators::Organization.any_instance.stub(:populate_and_save!).and_return(organization)
       end
-    end
-
-    context 'and a space is not given' do
-      subject { cf %W[rename-space --no-force] }
-      it 'prints out an error message' do
-        subject
-        expect(stderr.string).to include "No spaces."
-      end
-    end
-  end
-
-  context 'when there are spaces' do
-    let(:renamed_space) { spaces.first }
-    subject { cf %W[rename-space --no-force --no-quiet] }
-
-    context 'when the defaults are used' do
-      it 'asks for the space and new name and renames' do
-        mock_ask("Rename which space?", anything) { renamed_space }
-        mock_ask("New name") { new_name }
-        mock(renamed_space).name=(new_name)
-        mock(renamed_space).update!
-        subject
-      end
-    end
-
-    context 'when no name is provided, but a space is' do
-      subject { cf %W[rename-space --space #{renamed_space.name} --no-force] }
 
-      it 'asks for the new name and renames' do
-        dont_allow_ask("Rename which space?", anything)
-        mock_ask("New name") { new_name }
-        mock(renamed_space).name=(new_name)
-        mock(renamed_space).update!
-        subject
+      describe "metadata" do
+        let(:command) { Mothership.commands[:rename_space] }
+
+        describe "command" do
+          subject { command }
+          its(:description) { should eq "Rename a space" }
+          it { expect(Mothership::Help.group(:spaces)).to include(subject) }
+        end
+
+        include_examples "inputs must have descriptions"
+
+        describe "arguments" do
+          subject { command.arguments }
+          it "has the correct argument order" do
+            should eq([
+              {:type => :optional, :value => nil, :name => :space},
+              {:type => :optional, :value => nil, :name => :name}
+            ])
+          end
+        end
       end
-    end
-
-    context 'when a space is provided and a name' do
-      subject { cf %W[rename-space --space #{renamed_space.name} --name #{new_name} --no-force] }
 
-      it 'renames the space' do
-        mock(renamed_space).update!
-        subject
+      context "when there are no spaces" do
+        let(:spaces) { [] }
+
+        context "and a space is given" do
+          subject { cf %W[rename-space --space some-invalid-space --no-force --no-quiet] }
+          it "prints out an error message" do
+            subject
+            expect(stderr.string).to include "Unknown space 'some-invalid-space'."
+          end
+        end
+
+        context "and a space is not given" do
+          subject { cf %W[rename-space --no-force] }
+          it "prints out an error message" do
+            subject
+            expect(stderr.string).to include "No spaces."
+          end
+        end
       end
 
-      it 'displays the progress' do
-        mock_with_progress("Renaming to #{new_name}")
-        mock(renamed_space).update!
-
-        subject
+      context "when there are spaces" do
+        let(:renamed_space) { spaces.first }
+        subject { cf %W[rename-space --no-force --no-quiet] }
+
+        context "when the defaults are used" do
+          it "asks for the space and new name and renames" do
+            mock_ask("Rename which space?", anything) { renamed_space }
+            mock_ask("New name") { new_name }
+            renamed_space.should_receive(:name=).with(new_name)
+            renamed_space.should_receive(:update!)
+            subject
+          end
+        end
+
+        context "when no name is provided, but a space is" do
+          subject { cf %W[rename-space --space #{renamed_space.name} --no-force] }
+
+          it "asks for the new name and renames" do
+            dont_allow_ask("Rename which space?", anything)
+            mock_ask("New name") { new_name }
+            renamed_space.should_receive(:name=).with(new_name)
+            renamed_space.should_receive(:update!)
+            subject
+          end
+        end
+
+        context "when a space is provided and a name" do
+          subject { cf %W[rename-space --space #{renamed_space.name} --name #{new_name} --no-force] }
+
+          it "renames the space" do
+            renamed_space.should_receive(:update!)
+            subject
+          end
+
+          it "displays the progress" do
+            mock_with_progress("Renaming to #{new_name}")
+            renamed_space.should_receive(:update!)
+
+            subject
+          end
+        end
       end
     end
   end

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

@@ -1,79 +1,79 @@
-require 'spec_helper'
-require 'stringio'
+require "spec_helper"
 
-describe CF::Space::Space do
-  describe 'metadata' do
-    let(:command) { Mothership.commands[:space] }
+module CF
+  module Space
+    describe Space do
+      describe "metadata" do
+        let(:command) { Mothership.commands[:space] }
 
-    describe 'command' do
-      subject { command }
-      its(:description) { should eq "Show space information" }
-      it { expect(Mothership::Help.group(:spaces)).to include(subject) }
-    end
+        describe "command" do
+          subject { command }
+          its(:description) { should eq "Show space information" }
+          it { expect(Mothership::Help.group(:spaces)).to include(subject) }
+        end
 
-    include_examples 'inputs must have descriptions'
+        include_examples "inputs must have descriptions"
 
-    describe 'arguments' do
-      subject { command.arguments }
-      it 'has the correct argument order' do
-        should eq([
-          { :type => :optional, :value => nil, :name => :space }
-        ])
+        describe "arguments" do
+          subject { command.arguments }
+          it "has the correct argument order" do
+            should eq([
+              {:type => :optional, :value => nil, :name => :space}
+            ])
+          end
+        end
       end
-    end
-  end
 
-  describe "running the command" do
-    let(:apps) { fake_list(:app, 2) }
-    let(:domains) { fake_list(:domain, 2) }
-    let(:services) { fake_list(:service_instance, 2) }
-    let!(:space_1) { fake(:space, :name => "some_space_name", :apps => apps, :service_instances => services, :domains => domains) }
-    let(:spaces) { [space_1] }
-    let(:organization) { fake(:organization, :name => "Spacey Org", :spaces => spaces) }
-    let(:client) { fake_client(:spaces => spaces, :current_organization => organization) }
+      describe "running the command" do
+        let(:apps) { fake_list(:app, 2) }
+        let(:domains) { fake_list(:domain, 2) }
+        let(:services) { fake_list(:service_instance, 2) }
+        let!(:space_1) { fake(:space, :name => "some_space_name", :apps => apps, :service_instances => services, :domains => domains) }
+        let(:spaces) { [space_1] }
+        let(:organization) { fake(:organization, :name => "Spacey Org", :spaces => spaces) }
+        let(:client) { fake_client(:spaces => spaces, :current_organization => organization) }
 
-    before do
-      any_instance_of described_class do |cli|
-        stub(cli).client { client }
-        stub(cli).check_logged_in
-        stub(cli).check_target
-        any_instance_of(CF::Populators::Organization, :populate_and_save! => organization)
-        any_instance_of(CF::Populators::Space, :populate_and_save! => space_1)
-      end
-    end
+        before do
+          CF::Space::Base.any_instance.stub(:client) { client }
+          CF::Space::Base.any_instance.stub(:precondition)
+          CF::Populators::Organization.any_instance.stub(:populate_and_save!).and_return(organization)
+          CF::Populators::Space.any_instance.stub(:populate_and_save!).and_return(space_1)
+        end
 
-    context "with --quiet" do
-      subject { cf %W[space some_space_name --quiet] }
+        context "with --quiet" do
+          subject { cf %W[space some_space_name --quiet] }
 
-      it "shows only the name" do
-        subject
-        expect(stdout.read).to eq("some_space_name\n")
-      end
-    end
+          it "shows only the name" do
+            subject
+            expect(stdout.read).to eq("some_space_name\n")
+          end
+        end
 
-    context "with --no-quiet" do
-      subject { cf %W[space some_space_name --no-quiet] }
+        context "with --no-quiet" do
+          subject { cf %W[space some_space_name --no-quiet] }
 
-      before { subject }
+          before { subject }
 
-      it "shows the space's name" do
-        expect(stdout.read).to include("some_space_name:")
-      end
+          it "shows the space's name" do
+            expect(stdout.read).to include("some_space_name:")
+          end
 
-      it "shows the space's org" do
-        expect(stdout.read).to include("organization: Spacey Org")
-      end
+          it "shows the space's org" do
+            expect(stdout.read).to include("organization: Spacey Org")
+          end
 
-      it "shows apps" do
-        expect(stdout.read).to include("apps: #{apps.first.name}, #{apps.last.name}")
-      end
+          it "shows apps" do
+            expect(stdout.read).to include("apps: #{apps.first.name}, #{apps.last.name}")
+          end
 
-      it "shows services" do
-        expect(stdout.read).to include("services: #{services.first.name}, #{services.last.name}")
-      end
+          it "shows services" do
+            expect(stdout.read).to include("services: #{services.first.name}, #{services.last.name}")
+          end
 
-      it "shows domains" do
-        expect(stdout.read).to include("domains: #{domains.first.name}, #{domains.last.name}")
+          it "shows domains" do
+            expect(stdout.read).to include("domains: #{domains.first.name}, #{domains.last.name}")
+          end
+        end
       end
     end
   end