cf 0.6.1.rc3 → 0.6.1.rc4

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require "cf/cli/space/create"
 
-command CF::Space::Create do
+describe CF::Space::Create do
   describe 'metadata' do
     let(:command) { Mothership.commands[:create_space] }
 
@@ -25,21 +25,29 @@ command CF::Space::Create do
   end
 
   describe "running the command" do
-    let(:client) do
-      fake_client(:current_organization => organization)
-    end
-
-    let(:organization) { fake(:organization) }
-
     let(:new_space) { fake :space, :name => new_name }
     let(:new_name) { "some-new-name" }
 
+    let(:spaces) { [new_space] }
+    let(:organization) { fake(:organization, :spaces => spaces) }
+
+    let(:client) { fake_client(:current_organization => 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 }
+
+        stub(cli).check_logged_in
+        stub(cli).check_target
+        stub(cli).check_organization
+      end
     end
 
     context "when --target is given" do
@@ -59,6 +67,15 @@ command CF::Space::Create do
         subject
         expect(output).to say("Space created! Use switch-space #{new_space.name} to target it.")
       end
+
+      it_should_behave_like "a_command_that_populates_organization" do
+        before do
+          any_instance_of described_class do |cli|
+            stub.proxy(cli).check_organization
+          end
+        end
+      end
+
     end
 
     context "when we don't specify an organization" do

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

@@ -10,7 +10,10 @@ describe CF::Space::Rename do
   before do
     any_instance_of described_class do |cli|
       stub(cli).client { client }
-      stub(cli).precondition { nil }
+
+      stub(cli).check_logged_in
+      stub(cli).check_target
+      stub(cli).check_organization
     end
   end
 
@@ -29,8 +32,8 @@ describe CF::Space::Rename 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 }
+          {:type => :optional, :value => nil, :name => :space},
+          {:type => :optional, :value => nil, :name => :name}
         ])
       end
     end
@@ -58,10 +61,9 @@ describe CF::Space::Rename do
 
   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
-      subject { cf %W[rename-space --no-force --no-quiet] }
-
       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 }
@@ -74,6 +76,15 @@ describe CF::Space::Rename do
     context 'when no name is provided, but a space is' do
       subject { cf %W[rename-space --space #{renamed_space.name} --no-force] }
 
+      it_should_behave_like "a_command_that_populates_organization" do
+        subject { cf %W[rename-space --no-force --no-quiet #{renamed_space}] }
+        before do
+          any_instance_of described_class do |cli|
+            stub.proxy(cli).check_organization
+          end
+        end
+      end
+
       it 'asks for the new name and renames' do
         dont_allow_ask("Rename which space?", anything)
         mock_ask("New name") { new_name }

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

@@ -13,7 +13,9 @@ describe CF::Space::Spaces do
   before do
     any_instance_of described_class do |cli|
       stub(cli).client { client }
-      stub(cli).precondition { nil }
+      stub(cli).check_logged_in
+      stub(cli).check_target
+      stub(cli).check_organization
     end
   end
 
@@ -38,7 +40,7 @@ describe CF::Space::Spaces do
 
   subject { cf %W[spaces --#{bool_flag(:full)} --no-quiet] }
 
-  it 'should have the correct first two lines' do
+  it 'outputs that it is getting spaces' do
     subject
 
     stdout.rewind
@@ -72,6 +74,14 @@ describe CF::Space::Spaces do
   end
 
   context 'when there are spaces' do
+    it_should_behave_like "a_command_that_populates_organization" do
+      before do
+        any_instance_of described_class do |cli|
+          stub.proxy(cli).check_organization
+        end
+      end
+    end
+
     context 'and the full flag is given' do
       let(:full) { true }
 

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

@@ -10,8 +10,12 @@ describe CF::Space::Switch do
   before do
     any_instance_of described_class do |cli|
       stub(cli).client { client }
-      stub(cli).precondition { nil }
+
+      stub(cli).check_logged_in
+      stub(cli).check_target
+      stub(cli).check_organization
     end
+
   end
 
   describe 'metadata' do
@@ -28,21 +32,32 @@ describe CF::Space::Switch do
     describe 'arguments' do
       subject { command.arguments }
       it 'has the correct argument order' do
-        should eq([{ :type => :normal, :value => nil, :name => :name }])
+        should eq([{:type => :normal, :value => nil, :name => :name}])
       end
     end
   end
 
   subject { cf %W[--no-quiet switch-space #{space_to_switch_to.name} --no-color] }
 
+
   context "when the space exists" do
-    it "switches to that space" do
+    before do
       any_instance_of(Mothership) do |m|
         mock(m).invoke(:target, {:space => space_to_switch_to})
       end
+    end
 
+    it "switches to that space" do
       subject
     end
+
+    it_should_behave_like "a_command_that_populates_organization" do
+      before do
+        any_instance_of described_class do |cli|
+          stub.proxy(cli).check_organization
+        end
+      end
+    end
   end
 
   context "when the space does not exist" do

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

@@ -1,9 +1,13 @@
 require 'spec_helper'
 
-command CF::Start::Login do
-  let(:client) { fake_client :organizations => [] }
+describe CF::Start::Login do
+  let(:client) { fake_client }
 
   describe 'metadata' do
+    before do
+      stub_client_and_precondition
+    end
+
     let(:command) { Mothership.commands[:login] }
 
     describe 'command' do
@@ -32,12 +36,15 @@ command CF::Start::Login do
   end
 
   describe "running the command" do
+    before do
+      stub_client
+    end
+
     stub_home_dir_with { "#{SPEC_ROOT}/fixtures/fake_home_dirs/new" }
 
     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(:organizations) { [] }
 
     before do
       stub(client).login("my-username", "my-password") { auth_token }
@@ -47,105 +54,45 @@ command CF::Start::Login do
           :password => ["password", "8-digit PIN"]
         }
       end
-    end
 
-    subject { cf ["login"] }
-
-    it "logs in with the provided credentials and saves the token data to the YAML file" do
       stub_ask("Username", {}) { "my-username" }
       stub_ask("8-digit PIN", {:echo => "*", :forget => true}) { "my-password" }
-
-      subject
-
-      expect(tokens_yaml["https://api.some-domain.com"][:token]).to eq("bearer some-new-access-token")
-      expect(tokens_yaml["https://api.some-domain.com"][:refresh_token]).to eq("some-new-refresh-token")
+      any_instance_of(CF::Populators::Target, :populate_and_save! => true)
     end
 
-    context "when the user logs in with invalid credentials" do
-      before do
-        stub_ask("Username", {}) { "my-username" }
-        stub_ask("8-digit PIN", {:echo => "*", :forget => true}) { "my-password" }
+    subject { cf ["login"] }
 
-        stub(client).login("my-username", "my-password") { raise CFoundry::Denied }
+    context "when there is a target" do
+      before do
+        stub_precondition
       end
 
-      it "informs the user gracefully" do
+      it "logs in with the provided credentials and saves the token data to the YAML file" do
         subject
-        expect(output).to say("Authenticating... FAILED")
-      end
-    end
 
-    context "with space and org in the token file" do
-      before do
-        write_token_file(:space => "space-id-1", :organization => "organization-id-1")
-        stub_ask("Username", {}) { "my-username" }
-        stub_ask("8-digit PIN", {:echo => "*", :forget => true}) { "my-password" }
+        expect(tokens_yaml["https://api.some-domain.com"][:token]).to eq("bearer some-new-access-token")
+        expect(tokens_yaml["https://api.some-domain.com"][:refresh_token]).to eq("some-new-refresh-token")
       end
 
-      context "when the user has no organizations" do
-        it "clears the org and space param from the token file" do
-          subject
-
-          expect(tokens_yaml["https://api.some-domain.com"][:space]).to be_nil
-          expect(tokens_yaml["https://api.some-domain.com"][:organization]).to be_nil
-        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! }
+        subject
       end
 
-      context "when the user has an organization, but no spaces" do
-        let(:client) {
-          fake_client :organizations => organizations,
-            :token => CFoundry::AuthToken.new("bearer some-access-token")
-        }
-        let(:organization) { fake :organization, :users => [user] }
-        let(:user) { fake :user }
-
-        shared_examples_for :method_clearing_the_token_file do
-          it "sets the new organization in the token file" do
-            subject
-            expect(tokens_yaml["https://api.some-domain.com"][:organization]).to eq(organizations.first.guid)
-          end
-
-          it "clears the space param from the token file" do
-            subject
-            expect(tokens_yaml["https://api.some-domain.com"][:space]).to be_nil
-          end
+      context "when the user logs in with invalid credentials" do
+        before do
+          stub(client).login("my-username", "my-password") { raise CFoundry::Denied }
         end
 
-        context "with one organization" do
-          let(:organizations) {
-            [organization]
-          }
-
-          it "does not prompt for an organization" do
-            dont_allow_ask("Organization", anything)
-            subject
-          end
-
-          it_behaves_like :method_clearing_the_token_file
-        end
-
-        context "with multiple organizations" do
-          let(:organizations) {
-            [organization, OpenStruct.new(:name => 'My Org 2', :guid => 'organization-id-2')]
-          }
-
-          before do
-            stub_ask("Organization", anything) { organizations.first }
-          end
-
-          it "prompts for organization" do
-            mock_ask("Organization", anything) { organizations.first }
-            subject
-          end
-
-          it_behaves_like :method_clearing_the_token_file
+        it "informs the user gracefully" do
+          subject
+          expect(output).to say("Authenticating... FAILED")
         end
       end
     end
 
-    context 'when there is no target' do
+    context "when there is no target" do
       let(:client) { nil }
-      let(:stub_precondition?) { false }
 
       it "tells the user to select a target" do
         subject

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

@@ -1,22 +1,26 @@
-require 'spec_helper'
+require "spec_helper"
 require "webmock/rspec"
 
-command CF::Start::Target do
+describe CF::Start::Target do
+  before do
+    stub_client_and_precondition
+  end
+
   let(:client) { fake_client :apps => [app] }
   let(:app) { fake :app }
 
-  describe 'metadata' do
+  describe "metadata" do
     let(:command) { Mothership.commands[:target] }
 
-    describe 'command' do
+    describe "command" do
       subject { command }
       its(:description) { should eq "Set or display the target cloud, organization, and space" }
       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 }
@@ -24,36 +28,24 @@ command CF::Start::Target 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 => nil, :name => :url}]
       end
     end
   end
 
-  describe 'running the command' do
+  describe "running the command" do
     stub_home_dir_with { "#{SPEC_ROOT}/fixtures/fake_home_dirs/new" }
 
     context "when the user is authenticated and has an organization" do
-      let(:tokens_file_path) { '~/.cf/tokens.yml' }
-      let(:organizations) {
-        [ fake(:organization, :name => 'My Org', :guid => 'organization-id-1', :users => [user], :spaces => spaces),
-          fake(:organization, :name => 'My Org 2', :guid => 'organization-id-2') ]
-      }
-      let(:spaces) {
-        [ fake(:space, :name => 'Development', :guid => 'space-id-1'),
-          fake(:space, :name => 'Staging',     :guid => 'space-id-2') ]
-      }
-
       let(:user) { stub! }
-      let(:organization) { organizations.first }
-      let(:client) do
-        fake_client :organizations => organizations, :token => CFoundry::AuthToken.new("bearer some-access-token")
-      end
+      let(:organization) { fake(:organization, :name => "My Org", :guid => "organization-id-1", :users => [user], :spaces => [space]) }
+      let(:space) { fake(:space, :name => "Staging", :guid => "space-id-2", :developers => [user]) }
+      let(:client) { fake_client :organizations => [organization], :token => CFoundry::AuthToken.new("bearer some-access-token") }
 
       before do
-        write_token_file({:space => "space-id-1", :organization => "organization-id-1"})
         stub(client).current_user { user }
         stub(client).organization { organization }
         stub(client).current_organization { organization }
@@ -98,24 +90,33 @@ command CF::Start::Target do
       end
 
       describe "switching the space" do
-        let(:space) { spaces.last }
-        let(:tokens_yaml) { YAML.load_file(File.expand_path(tokens_file_path)) }
-        let(:tokens_file_path) { '~/.cf/tokens.yml' }
-
         def run_command
           cf %W[target -s #{space.name}]
         end
 
-        it "should not reprompt for organization" do
-          dont_allow_ask("Organization", anything)
+        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! }
           run_command
         end
 
-        it "sets the space param in the token file" do
+        it "prints out the space from the updated client" do
+          any_instance_of(CF::Populators::Target, :populate_and_save! => true)
+          stub(client).current_space { space }
+
           run_command
-          expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == 'space-id-2'
+          expect(output).to say("space: #{space.name}")
         end
       end
     end
+
+    context "when client is nil" do
+      let(:client) { nil }
+      subject { cf ["target"] }
+
+      it 'prints an error' do
+        subject
+        expect(error_output).to say("No target has been specified.")
+      end
+    end
   end
 end