cf 1.1.3.rc1 → 1.1.4

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

@@ -1,5 +1,4 @@
-require 'spec_helper'
-require "cf/cli/service/rename"
+require "spec_helper"
 
 describe CF::Service::Rename do
   let(:global) { { :color => false, :quiet => true } }
@@ -9,29 +8,26 @@ describe CF::Service::Rename do
   let(:service) {}
   let(:new_name) { "some-new-name" }
 
+  subject { Mothership.new.invoke(:rename_service, inputs, given, global) }
+
   before do
-    any_instance_of(CF::CLI) do |cli|
-      stub(cli).client { client }
-      stub(cli).precondition { nil }
-    end
+    CF::CLI.any_instance.stub(:client).and_return(client)
   end
 
-  subject { Mothership.new.invoke(:rename_service, inputs, given, global) }
-
-  describe 'metadata' do
+  describe "metadata" do
     let(:command) { Mothership.commands[:rename_service] }
 
-    describe 'command' do
+    describe "command" do
       subject { command }
       its(:description) { should eq "Rename a service" }
       it { expect(Mothership::Help.group(:services, :manage)).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 the correct argument order' do
+      it "has the correct argument order" do
         should eq([
           { :type => :optional, :value => nil, :name => :service },
           { :type => :optional, :value => nil, :name => :name }
@@ -40,62 +36,62 @@ describe CF::Service::Rename do
     end
   end
 
-  context 'when there are no services' do
-    context 'and a service is given' do
+  context "when there are no services" do
+    context "and a service is given" do
       let(:given) { { :service => "some-service" } }
       it { expect { subject }.to raise_error(CF::UserError, "Unknown service 'some-service'.") }
     end
 
-    context 'and a service is not given' do
+    context "and a service is not given" do
       it { expect { subject }.to raise_error(CF::UserError, "No services.") }
     end
   end
 
-  context 'when there are services' do
+  context "when there are services" do
     let(:client) { fake_client(:service_instances => services) }
     let(:services) { fake_list(:service_instance, 2) }
     let(:renamed_service) { services.first }
 
-    context 'when the defaults are used' do
-      it 'asks for the service and new name and renames' do
+    context "when the defaults are used" do
+      it "asks for the service and new name and renames" do
         mock_ask("Rename which service?", anything) { renamed_service }
         mock_ask("New name") { new_name }
-        mock(renamed_service).name=(new_name)
-        mock(renamed_service).update!
+        renamed_service.should_receive(:name=).with(new_name)
+        renamed_service.should_receive(:update!)
         subject
       end
     end
 
-    context 'when no name is provided, but a service is' do
+    context "when no name is provided, but a service is" do
       let(:given) { { :service => renamed_service.name } }
 
-      it 'asks for the new name and renames' do
+      it "asks for the new name and renames" do
         dont_allow_ask("Rename which service?", anything)
         mock_ask("New name") { new_name }
-        mock(renamed_service).name=(new_name)
-        mock(renamed_service).update!
+        renamed_service.should_receive(:name=).with(new_name)
+        renamed_service.should_receive(:update!)
         subject
       end
     end
 
-    context 'when a service is provided and a name' do
+    context "when a service is provided and a name" do
       let(:inputs) { { :service => renamed_service, :name => new_name } }
 
-      it 'renames the service' do
-        mock(renamed_service).update!
+      it "renames the service" do
+        renamed_service.should_receive(:update!)
         subject
       end
 
-      it 'displays the progress' do
+      it "displays the progress" do
         mock_with_progress("Renaming to #{new_name}")
-        mock(renamed_service).update!
+        renamed_service.should_receive(:update!)
 
         subject
       end
 
-      context 'and the name already exists' do
-        it 'fails' do
-          mock(renamed_service).update! { raise CFoundry::ServiceInstanceNameTaken.new("Taken", 200) }
+      context "and the name already exists" do
+        it "fails" do
+          renamed_service.should_receive(:update!) { raise CFoundry::ServiceInstanceNameTaken.new("Taken", 200) }
           expect { subject }.to raise_error(CFoundry::ServiceInstanceNameTaken)
         end
       end

data/spec/cf/cli/service/services_spec.rb

@@ -1,64 +1,63 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe CF::Service::Services do
-  let(:command) { Mothership.commands[:services] }
+module CF
+  module Service
+    describe Services do
+      let(:command) { Mothership.commands[:services] }
 
-  describe 'metadata' do
-    describe 'command' do
-      subject { command }
-      its(:description) { should eq "List your services" }
-      it { expect(Mothership::Help.group(:services)).to include(subject) }
-    end
+      describe "metadata" do
+        describe "command" do
+          subject { command }
+          its(:description) { should eq "List your services" }
+          it { expect(Mothership::Help.group(:services)).to include(subject) }
+        end
 
-    include_examples 'inputs must have descriptions'
+        include_examples "inputs must have descriptions"
 
-    describe 'arguments' do
-      subject { command.arguments }
-      it 'has no required arguments' do
-        should eq([])
-      end
-    end
+        describe "arguments" do
+          subject { command.arguments }
+          it "has no required arguments" do
+            should eq([])
+          end
+        end
 
-    describe 'inputs' do
-      subject { command.inputs }
-      it 'has the expected inputs' do
-        subject.keys.should =~ [:name, :service, :plan, :provider, :version, :app, :full, :space]
+        describe "inputs" do
+          subject { command.inputs }
+          it "has the expected inputs" do
+            subject.keys.should =~ [:name, :service, :plan, :provider, :version, :app, :full, :space]
+          end
+        end
       end
-    end
-  end
 
-  describe 'listing services' do
-    let(:global) { { :color => false } }
-    let(:inputs) { {} }
-    let(:given) { {} }
-    let(:client) { fake_client(:current_space => current_space, :service_instances => service_instances) }
+      describe "listing services" do
+        let(:global) { {:color => false} }
+        let(:inputs) { {} }
+        let(:given) { {} }
+        let(:client) { fake_client(:current_space => current_space, :service_instances => service_instances) }
 
-    let(:service_plan) { fake(:service_plan, :service => fake(:service, :version => 'service_version', :provider => 'provider') ) }
-    let(:service1) { fake(:service_instance, :service_plan => service_plan ) }
+        let(:service_plan) { fake(:service_plan, :service => fake(:service, :version => "service_version", :provider => "provider")) }
+        let(:service1) { fake(:service_instance, :service_plan => service_plan) }
 
-    let(:service_instances) { [service1] }
-    let(:current_space) { fake(:space, :name => 'the space' ) }
+        let(:service_instances) { [service1] }
+        let(:current_space) { fake(:space, :name => "the space") }
 
-    subject do
-      capture_output { Mothership.new.invoke(:services, inputs, given, global) }
-    end
+        subject do
+          capture_output { Mothership.new.invoke(:services, inputs, given, global) }
+        end
 
-    before do
-      any_instance_of(CF::CLI) do |cli|
-        stub(cli).client { client }
-        stub(cli).precondition { nil }
-      end
-    end
+        before do
+          CF::CLI.any_instance.stub(:client).and_return(client)
+        end
 
-    it 'produces a table of services' do
-      subject
-      stdout.rewind
-      output = stdout.read
+        it "produces a table of services" do
+          subject
+          stdout.rewind
+          output = stdout.read
 
-      expect(output).to match /Getting services in the space.*OK/
+          expect(output).to match /Getting services in the space.*OK/
 
-      expect(output).to match /name\s+service\s+provider\s+version\s+plan\s+bound apps/
-      expect(output).to match /service_instance-.+?\s+  # name
+          expect(output).to match /name\s+service\s+provider\s+version\s+plan\s+bound apps/
+          expect(output).to match /service_instance-.+?\s+  # name
         service-.*?\s+                                  # service
         provider.*?\s+                                  # provider
         service_version\s+                              # version
@@ -66,7 +65,8 @@ describe CF::Service::Services do
         none\s+                                         # bound apps
         /x
 
+        end
+      end
     end
   end
 end
-

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

@@ -1,41 +1,48 @@
-require 'spec_helper'
-require "cf/cli/app/base"
+require "spec_helper"
 
-describe CF::Space::Base do
-  describe '#run' do
-    subject { CF::Space::Base.new }
-
-    it "uses a populator to set organization" do
-      org = stub
-      mock(CF::Populators::Organization).new(instance_of(Mothership::Inputs)) { stub!.populate_and_save! { org } }
-      stub(subject).send()
-
-      subject.run(:some_command)
-      subject.org.should == org
-    end
+module CF::Space
+  class Base; def fake_method; end
   end
+end
 
-  describe '.space_by_name' do
-    subject { CF::Space::Base::space_by_name }
-    let(:org) do
-      Object.new.tap do |o|
-        mock(o).space_by_name("mySpace").returns(space)
-      end
-    end
+module CF
+  module Space
+    describe Base do
+      describe "#run" do
+        subject { CF::Space::Base.new }
 
-    context "with a space" do
-      let(:space) { mock }
-      it "returns a space matching the name from the given org" do
-        subject.call("mySpace", org).should == space
+        it "uses a populator to set organization" do
+          organization = double
+          CF::Populators::Organization.should_receive(:new) { double(:populator, :populate_and_save! => organization) }
+          subject.run(:fake_method)
+          subject.org.should == organization
+        end
       end
-    end
 
-    context "with no matching space" do
-      let(:space) { nil }
-      it "fails when no space matches the name" do
-        expect {
-          subject.call("mySpace", org)
-        }.to raise_exception
+      describe ".space_by_name" do
+        subject { CF::Space::Base.space_by_name }
+        let(:org) { double(:organization) }
+
+        before do
+          org.should_receive(:space_by_name).with("mySpace").and_return(space)
+        end
+
+
+        context "with a space" do
+          let(:space) { double(:space) }
+          it "returns a space matching the name from the given org" do
+            CF::Space::Base.space_by_name.call("mySpace", org).should == space
+          end
+        end
+
+        context "with no matching space" do
+          let(:space) { nil }
+          it "fails when no space matches the name" do
+            expect {
+              CF::Space::Base.space_by_name.call("mySpace", org)
+            }.to raise_exception
+          end
+        end
       end
     end
   end

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

@@ -1,69 +1,68 @@
-require 'spec_helper'
-require "cf/cli/space/create"
+require "spec_helper"
 
-describe CF::Space::Create do
-  describe 'metadata' do
-    let(:command) { Mothership.commands[:create_space] }
+module CF
+  module Space
+    describe Create do
+      describe "metadata" do
+        let(:command) { Mothership.commands[:create_space] }
 
-    describe 'command' do
-      subject { command }
-      its(:description) { should eq "Create a space in an organization" }
-      it { expect(Mothership::Help.group(:spaces)).to include(subject) }
-    end
+        describe "command" do
+          subject { command }
+          its(:description) { should eq "Create a space in an organization" }
+          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 => :name },
-          { :type => :optional, :value => nil, :name => :organization }
-        ])
+        describe "arguments" do
+          subject { command.arguments }
+          it "has the correct argument order" do
+            should eq([
+              {:type => :optional, :value => nil, :name => :name},
+              {:type => :optional, :value => nil, :name => :organization}
+            ])
+          end
+        end
       end
-    end
-  end
-
-  describe "running the command" do
-    let(:new_space) { fake :space, :name => new_name }
-    let(:new_name) { "some-new-name" }
 
-    let(:spaces) { [new_space] }
-    let(:organization) { fake(:organization, :spaces => spaces) }
+      describe "running the command" do
+        let(:new_space) { fake(:space, :name => new_name) }
+        let(:new_name) { "some-new-name" }
 
-    let(:client) { fake_client(:current_organization => organization, :spaces => spaces) }
+        let(:spaces) { [new_space] }
+        let(:organization) { fake(:organization, :spaces => spaces) }
 
-    before do
-      stub(client).space { new_space }
-      stub(new_space).create!
-      stub(new_space).add_manager
-      stub(new_space).add_developer
-      stub(new_space).add_auditor
-      any_instance_of described_class do |cli|
-        stub(cli).client { client }
+        let(:client) { fake_client(:current_organization => organization, :spaces => spaces) }
 
-        stub(cli).check_logged_in
-        stub(cli).check_target
-        any_instance_of(CF::Populators::Organization, :populate_and_save! => organization)
-      end
-    end
+        before do
+          client.stub(:space).and_return(new_space)
+          new_space.stub(:create!)
+          new_space.stub(:add_manager)
+          new_space.stub(:add_developer)
+          new_space.stub(:add_auditor)
+          described_class.any_instance.stub(:client).and_return(client)
+          described_class.any_instance.stub(:precondition).and_return(nil)
+          CF::Populators::Organization.any_instance.stub(:populate_and_save!).and_return(organization)
+          CF::Populators::Organization.any_instance.stub(:choices).and_return([organization])
+        end
 
-    context "when --target is given" do
-      subject { cf %W[create-space #{new_space.name} --target] }
+        context "when --target is given" do
+          subject { cf %W[create-space #{new_space.name} --target] }
 
-      it "switches them to the new space" do
-        mock_invoke :target, :organization => organization,
-          :space => new_space
-        subject
-      end
-    end
+          it "switches them to the new space" do
+            mock_invoke :target, :organization => organization, :space => new_space
+            subject
+          end
+        end
 
-    context "when --target is NOT given" do
-      subject { cf %W[create-space #{new_space.name}] }
+        context "when --target is NOT given" do
+          subject { cf %W[create-space #{new_space.name}] }
 
-      it "tells the user how they can switch to the new space" do
-        subject
-        expect(output).to say("Space created! Use `cf switch-space #{new_space.name}` to target it.")
+          it "tells the user how they can switch to the new space" do
+            subject
+            expect(output).to say("Space created! Use `cf switch-space #{new_space.name}` to target it.")
+          end
+        end
       end
     end
   end