cf 1.1.3.rc1 → 1.1.4

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

@@ -1,105 +1,100 @@
-require 'spec_helper'
-require 'stringio'
-
-describe CF::Space::Spaces do
-  let(:full) { false }
-  let!(:space_1) { fake(:space, :name => "bb_second", :apps => fake_list(:app, 2), :service_instances => [fake(:service_instance)]) }
-  let!(:space_2) { fake(:space, :name => "aa_first", :apps => [fake(:app)], :service_instances => fake_list(:service_instance, 3), :domains => [fake(:domain)]) }
-  let!(:space_3) { fake(:space, :name => "cc_last", :apps => fake_list(:app, 2), :service_instances => fake_list(:service_instance, 2), :domains => fake_list(:domain, 2)) }
-  let(:spaces) { [space_1, space_2, space_3]}
-  let(:organization) { fake(:organization, :spaces => spaces, :name => 'foo') }
-  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)
-    end
-  end
+require "spec_helper"
+
+module CF
+  module Space
+    describe Spaces do
+      let(:full) { false }
+      let!(:space_1) { fake(:space, :name => "bb_second", :apps => fake_list(:app, 2), :service_instances => [fake(:service_instance)]) }
+      let!(:space_2) { fake(:space, :name => "aa_first", :apps => [fake(:app)], :service_instances => fake_list(:service_instance, 3), :domains => [fake(:domain)]) }
+      let!(:space_3) { fake(:space, :name => "cc_last", :apps => fake_list(:app, 2), :service_instances => fake_list(:service_instance, 2), :domains => fake_list(:domain, 2)) }
+      let(:spaces) { [space_1, space_2, space_3] }
+      let(:organization) { fake(:organization, :spaces => spaces, :name => "foo") }
+      let(:client) { fake_client(:spaces => spaces, :current_organization => organization) }
+
+      before do
+        stub_client_and_precondition
+        CF::Populators::Organization.any_instance.stub(:populate_and_save!).and_return(organization)
+      end
 
-  describe 'metadata' do
-    let(:command) { Mothership.commands[:spaces] }
+      describe "metadata" do
+        let(:command) { Mothership.commands[:spaces] }
 
-    describe 'command' do
-      subject { command }
-      its(:description) { should eq "List spaces in an organization" }
-      it { expect(Mothership::Help.group(:spaces)).to include(subject) }
-    end
+        describe "command" do
+          subject { command }
+          its(:description) { should eq "List spaces 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 => :organization }])
+        describe "arguments" do
+          subject { command.arguments }
+          it "has the correct argument order" do
+            should eq([{:type => :optional, :value => nil, :name => :organization}])
+          end
+        end
       end
-    end
-  end
 
-  subject { cf %W[spaces --#{bool_flag(:full)} --no-quiet] }
+      subject { cf %W[spaces --#{bool_flag(:full)} --no-quiet] }
 
-  it 'outputs that it is getting spaces' do
-    subject
+      it "outputs that it is getting spaces" do
+        subject
 
-    stdout.rewind
-    expect(stdout.readline).to match /Getting spaces.*OK/
-    expect(stdout.readline).to eq "\n"
-  end
+        stdout.rewind
+        expect(stdout.readline).to match /Getting spaces.*OK/
+        expect(stdout.readline).to eq "\n"
+      end
 
-  context 'when there are no spaces' do
-    let(:spaces) { [] }
+      context "when there are no spaces" do
+        let(:spaces) { [] }
 
-    context 'and the full flag is given' do
-      let(:full) { true }
+        context "and the full flag is given" do
+          let(:full) { true }
 
-      it 'displays yaml-style output with all space details' do
-        any_instance_of CF::Space::Spaces do |spaces|
-          dont_allow(spaces).invoke
+          it "displays yaml-style output with all space details" do
+            CF::Space::Spaces.any_instance.should_not_receive(:invoke)
+            subject
+          end
         end
-        subject
-      end
-    end
 
-    context 'and the full flag is not given (default is false)' do
-      it 'should show only the progress' do
-        subject
+        context "and the full flag is not given (default is false)" do
+          it "should show only the progress" do
+            subject
 
-        stdout.rewind
-        expect(stdout.readline).to match /Getting spaces.*OK/
-        expect(stdout).to be_eof
+            stdout.rewind
+            expect(stdout.readline).to match /Getting spaces.*OK/
+            expect(stdout).to be_eof
+          end
+        end
       end
-    end
-  end
 
-  context 'when there are spaces' do
-    context 'and the full flag is given' do
-      let(:full) { true }
+      context "when there are spaces" do
+        context "and the full flag is given" do
+          let(:full) { true }
 
-      it 'displays yaml-style output with all space details' do
-        any_instance_of CF::Space::Spaces do |spaces|
-          mock(spaces).invoke(:space, :space => space_2, :full => true).ordered
-          mock(spaces).invoke(:space, :space => space_1, :full => true).ordered
-          mock(spaces).invoke(:space, :space => space_3, :full => true).ordered
+          it "displays yaml-style output with all space details" do
+            CF::Space::Spaces.any_instance.should_receive(:invoke).with(:space, :space => space_2, :full => true)
+            CF::Space::Spaces.any_instance.should_receive(:invoke).with(:space, :space => space_1, :full => true)
+            CF::Space::Spaces.any_instance.should_receive(:invoke).with(:space, :space => space_3, :full => true)
+            subject
+          end
         end
-        subject
-      end
-    end
 
-    context 'and the full flag is not given (default is false)' do
-      it 'displays tabular output with names, spaces and domains' do
-        subject
+        context "and the full flag is not given (default is false)" do
+          it "displays tabular output with names, spaces and domains" do
+            subject
 
-        stdout.rewind
-        stdout.readline
-        stdout.readline
+            stdout.rewind
+            stdout.readline
+            stdout.readline
 
-        expect(stdout.readline).to match /name\s+apps\s+services/
-        spaces.sort_by(&:name).each do |space|
-          expect(stdout.readline).to match /#{space.name}\s+#{name_list(space.apps)}\s+#{name_list(space.service_instances)}/
+            expect(stdout.readline).to match /name\s+apps\s+services/
+            spaces.sort_by(&:name).each do |space|
+              expect(stdout.readline).to match /#{space.name}\s+#{name_list(space.apps)}\s+#{name_list(space.service_instances)}/
+            end
+            expect(stdout).to be_eof
+          end
         end
-        expect(stdout).to be_eof
       end
     end
   end

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

@@ -1,60 +1,57 @@
-require 'spec_helper'
-require "cf/cli/space/switch"
-
-describe CF::Space::Switch do
-  let(:space_to_switch_to) { spaces.last }
-  let(:spaces) { fake_list(:space, 3) }
-  let(:organization) { fake(:organization, :spaces => spaces) }
-  let(:client) { fake_client(:current_organization => organization, :spaces => spaces) }
-
-  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
+require "spec_helper"
+
+module CF
+  module Space
+    describe Switch do
+      let(:space_to_switch_to) { spaces.last }
+      let(:spaces) { fake_list(:space, 3) }
+      let(:organization) { fake(:organization, :spaces => spaces) }
+      let(:client) { fake_client(:current_organization => organization, :spaces => spaces) }
+
+      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)
+      end
 
-  describe 'metadata' do
-    let(:command) { Mothership.commands[:switch_space] }
+      describe "metadata" do
+        let(:command) { Mothership.commands[:switch_space] }
 
-    describe 'command' do
-      subject { command }
-      its(:description) { should eq "Switch to a space" }
-      it { expect(Mothership::Help.group(:spaces)).to include(subject) }
-    end
+        describe "command" do
+          subject { command }
+          its(:description) { should eq "Switch to a space" }
+          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 => :normal, :value => nil, :name => :name}])
+        describe "arguments" do
+          subject { command.arguments }
+          it "has the correct argument order" do
+            should eq([{:type => :normal, :value => nil, :name => :name}])
+          end
+        end
       end
-    end
-  end
 
-  subject { cf %W[--no-quiet switch-space #{space_to_switch_to.name} --no-color] }
+      subject { cf %W[--no-quiet switch-space #{space_to_switch_to.name} --no-color] }
 
-  context "when the space exists" do
-    before do
-      any_instance_of(Mothership) do |m|
-        mock(m).invoke(:target, {:space => space_to_switch_to})
-      end
-    end
+      context "when the space exists" do
+        before do
+          Mothership.any_instance.should_receive(:invoke).with(:target, {:space => space_to_switch_to})
+        end
 
-    it "switches to that space" do
-      subject
-    end
-  end
+        it "switches to that space" do
+          subject
+        end
+      end
 
-  context "when the space does not exist" do
-    let(:space_to_switch_to) { fake(:space, :name => "unique-name") }
+      context "when the space does not exist" do
+        let(:space_to_switch_to) { fake(:space, :name => "unique-name") }
 
-    it_behaves_like "an error that gets passed through",
-      :with_exception => CF::UserError,
-      :with_message => "The space unique-name does not exist, please create the space first."
+        it_behaves_like "an error that gets passed through",
+          :with_exception => CF::UserError,
+          :with_message => "The space unique-name does not exist, please create the space first."
+      end
+    end
   end
 end

data/spec/cf/cli/start/info_spec.rb

@@ -16,9 +16,7 @@ describe CF::Start::Info do
   end
 
   before do
-    any_instance_of described_class do |cli|
-      stub(cli).client { client }
-    end
+    described_class.any_instance.stub(:client).and_return(client)
   end
 
   describe 'metadata' do
@@ -50,7 +48,7 @@ describe CF::Start::Info do
 
   context 'when given no flags' do
     it "displays target information" do
-      mock(client).info { target_info }
+      client.should_receive(:info).and_return(target_info)
 
       subject
 
@@ -67,7 +65,7 @@ describe CF::Start::Info do
     let(:services) { true }
 
     it 'does not grab /info' do
-      dont_allow(client).info
+      client.should_not_receive(:info)
       subject
     end
 
@@ -89,7 +87,7 @@ describe CF::Start::Info do
     let(:all) { true }
 
     it 'runs as --services' do
-      mock(client).info { target_info }
+      client.should_receive(:info).and_return(target_info)
 
       subject
 

data/spec/cf/cli/start/login_spec.rb

@@ -1,24 +1,24 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe CF::Start::Login do
   let(:client) { fake_client }
 
-  describe 'metadata' do
+  describe "metadata" do
     before do
       stub_client_and_precondition
     end
 
     let(:command) { Mothership.commands[:login] }
 
-    describe 'command' do
+    describe "command" do
       subject { command }
       its(:description) { should eq "Authenticate with the target" }
       specify { expect(Mothership::Help.group(:start)).to include(subject) }
     end
 
-    include_examples 'inputs must have descriptions'
+    include_examples "inputs must have descriptions"
 
-    describe 'flags' do
+    describe "flags" do
       subject { command.flags }
 
       its(["-o"]) { should eq :organization }
@@ -27,9 +27,9 @@ describe CF::Start::Login do
       its(["-s"]) { should eq :space }
     end
 
-    describe 'arguments' do
+    describe "arguments" do
       subject(:arguments) { command.arguments }
-      it 'have the correct commands' do
+      it "have the correct commands" do
         expect(arguments).to eq [{:type => :optional, :value => :email, :name => :username}]
       end
     end
@@ -44,26 +44,25 @@ describe CF::Start::Login do
 
     let(:auth_token) { CFoundry::AuthToken.new("bearer some-new-access-token", "some-new-refresh-token") }
     let(:tokens_yaml) { YAML.load_file(File.expand_path(tokens_file_path)) }
-    let(:tokens_file_path) { '~/.cf/tokens.yml' }
+    let(:tokens_file_path) { "~/.cf/tokens.yml" }
 
     before do
-      stub(client).login("my-username", "my-password") { auth_token }
-      stub(client).login_prompts do
-        {
-          :username => ["text", "Username"],
-          :password => ["password", "8-digit PIN"]
-        }
-      end
+      client.stub(:login).with("my-username", "my-password") { auth_token }
+      client.stub(:login_prompts).and_return(
+      {
+        :username => ["text", "Username"],
+        :password => ["password", "8-digit PIN"]
+      })
 
       stub_ask("Username", {}) { "my-username" }
       stub_ask("8-digit PIN", {:echo => "*", :forget => true}) { "my-password" }
-      any_instance_of(CF::Populators::Target, :populate_and_save! => true)
     end
 
     subject { cf ["login"] }
 
     context "when there is a target" do
       before do
+        CF::Populators::Target.any_instance.stub(:populate_and_save!)
         stub_precondition
       end
 
@@ -75,13 +74,13 @@ describe CF::Start::Login do
       end
 
       it "calls use a PopulateTarget to ensure that an organization and space is set" do
-        mock(CF::Populators::Target).new(is_a(Mothership::Inputs)) { mock!.populate_and_save! }
+        CF::Populators::Target.should_receive(:new) { double(:target, :populate_and_save! => true) }
         subject
       end
 
       context "when the user logs in with invalid credentials" do
         before do
-          stub(client).login("my-username", "my-password") { raise CFoundry::Denied }
+          client.should_receive(:login).with("my-username", "my-password").and_raise(CFoundry::Denied)
         end
 
         it "informs the user gracefully" do
@@ -92,9 +91,8 @@ describe CF::Start::Login do
     end
 
     context "when there is no target" do
-      let(:client) { nil }
-
       it "tells the user to select a target" do
+        client.stub(:target) { nil }
         subject
         expect(error_output).to say("Please select a target with 'cf target'.")
       end

data/spec/cf/cli/start/logout_spec.rb

@@ -1,50 +1,49 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe CF::Start::Logout do
-  let(:client) { fake_client }
+module CF
+  module Start
+    describe Logout do
+      let(:client) { fake_client }
 
-  before do
-    any_instance_of described_class do |cli|
-      stub(cli).client { client }
-    end
-  end
+      before do
+        described_class.any_instance.stub(:client) { client }
+      end
 
-  describe 'metadata' do
-    let(:command) { Mothership.commands[:logout] }
+      describe "metadata" do
+        let(:command) { Mothership.commands[:logout] }
 
-    describe 'command' do
-      subject { command }
-      its(:description) { should eq "Log out from the target" }
-      it { expect(Mothership::Help.group(:start)).to include(subject) }
-    end
-  end
+        describe "command" do
+          subject { command }
+          its(:description) { should eq "Log out from the target" }
+          it { expect(Mothership::Help.group(:start)).to include(subject) }
+        end
+      end
 
-  describe "running the command" do
-    subject { cf ["logout"] }
+      describe "running the command" do
+        subject { cf ["logout"] }
 
-    context "when there is a target" do
-      let(:info) { { client.target => "x", "abc" => "x" } }
+        context "when there is a target" do
+          let(:info) { {client.target => "x", "abc" => "x"} }
 
-      before do
-        any_instance_of CF::CLI do |cli|
-          stub(cli).targets_info { info }
-          stub(cli).client_target { client.target }
+          before do
+            CF::CLI.any_instance.stub(:targets_info) { info }
+            CF::CLI.any_instance.stub(:client_target) { client.target }
+          end
+
+          it "removes the target info from the tokens file" do
+            expect {
+              subject
+            }.to change { info }.to("abc" => "x")
+          end
         end
-      end
 
-      it "removes the target info from the tokens file" do
-        expect {
-          subject
-        }.to change { info }.to("abc" => "x")
+        context "when there is no target" do
+          let(:client) { nil }
+          it_behaves_like "an error that gets passed through",
+            :with_exception => CF::UserError,
+            :with_message => "Please select a target with 'cf target'."
+        end
       end
     end
-
-    context "when there is no target" do
-      let(:client) { nil }
-      it_behaves_like "an error that gets passed through",
-        :with_exception => CF::UserError,
-        :with_message => "Please select a target with 'cf target'."
-    end
   end
 end
-