cf 1.1.3.rc1 → 1.1.4

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

@@ -1,155 +1,153 @@
 require "spec_helper"
-require "webmock/rspec"
-require "cf/cli/populators/organization"
-
-describe CF::Populators::Organization do
-  stub_home_dir_with { "#{SPEC_ROOT}/fixtures/fake_home_dirs/new" }
-
-  describe "#populate_and_save!" do
-    let(:tokens_file_path) { CF::TOKENS_FILE }
-    let(:user) { stub! }
-    let(:organizations) do
-      [
-        fake(:organization, :name => "My Org", :guid => "organization-id-1", :users => [user]),
-        fake(:organization, :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)) }
-    let(:populator) { populator = CF::Populators::Organization.new(Mothership::Inputs.new(nil, nil, input)) }
-
-    before do
-      stub(client).current_user { user }
-      stub(client).organization { organization }
-      stub(client).current_organization { organization }
-      stub(client).target { 'https://api.some-domain.com' }
-      any_instance_of(described_class) do |instance|
-        stub(instance).client { client }
-      end
 
-      write_token_file({:organization => "organization-id-1"})
-    end
+module CF
+  module Populators
+    describe Organization do
+      stub_home_dir_with { "#{SPEC_ROOT}/fixtures/fake_home_dirs/new" }
+
+      describe "#populate_and_save!" do
+        let(:tokens_file_path) { CF::TOKENS_FILE }
+        let(:user) { build(:user) }
+        let(:organizations) do
+          [
+            double(:organization, :name => "My Org", :guid => "organization-id-1", :users => [user]),
+            double(:organization, :name => "Other Org", :guid => "organization-id-2")
+          ]
+        end
+        let(:organization) { organizations.first }
+        let(:client) { fake_client :organizations => organizations }
 
-    subject do
-      capture_output { populator.populate_and_save! }
-    end
+        let(:input) { {:organization => organization} }
+        let(:tokens_yaml) { YAML.load_file(File.expand_path(tokens_file_path)) }
+        let(:populator) { populator = CF::Populators::Organization.new(Mothership::Inputs.new(nil, nil, input)) }
 
-    it "updates the client with the new organization" do
-      write_token_file({:organization => "organization-id-2"})
-      any_instance_of(described_class) do |instance|
-        stub.proxy(instance).client
-      end
-      populator.client.current_organization.guid.should == "organization-id-2"
+        before do
+          client.stub(:current_user).and_return(user)
+          client.stub(:organization).and_return(organization)
+          client.stub(:current_organization).and_return(organization)
+          client.stub(:target).and_return('https://api.some-domain.com')
+          described_class.any_instance.stub(:client).and_return(client)
 
-      subject
+          write_token_file({:organization => "organization-id-1"})
+        end
 
-      populator.client.current_organization.guid.should == "organization-id-1"
-    end
+        subject do
+          capture_output { populator.populate_and_save! }
+        end
 
-    it "returns the organization" do
-      subject.should == organization
-    end
+        it "updates the client with the new organization" do
+          write_token_file({:organization => "organization-id-2"})
+          described_class.any_instance.unstub(:client)
+          populator.client.current_organization.guid.should == "organization-id-2"
 
-    context "with an organization in the input" do
-      let(:input) { {:organization => organization} }
-      before { write_token_file({:organization => "organization-id-2"}) }
+          subject
 
-      it "uses that organization" do
-        subject.should == organization
-      end
+          populator.client.current_organization.guid.should == "organization-id-1"
+        end
 
-      it "should not reprompt for organization" do
-        dont_allow_ask("Organization", anything)
-        subject
-      end
+        it "returns the organization" do
+          subject.should == organization
+        end
 
-      it "sets the organization in the token file" do
-        subject
-        expect(tokens_yaml["https://api.some-domain.com"][:organization]).to be == "organization-id-1"
-      end
+        context "with an organization in the input" do
+          let(:input) { {:organization => organization} }
+          before { write_token_file({:organization => "organization-id-2"}) }
 
-      it "prints out that it is switching to that organization" do
-        subject
-        expect(output).to say("Switching to organization #{organization.name}")
-      end
+          it "uses that organization" do
+            subject.should == organization
+          end
 
-      context "and a different organization and space in the token file" do
-        let(:input) { {:organization => organizations.last} }
+          it "should not reprompt for organization" do
+            dont_allow_ask("Organization", anything)
+            subject
+          end
 
-        before do
-          write_token_file({:organization => "organization-id-1", :space => "should-be-removed"})
-        end
+          it "sets the organization in the token file" do
+            subject
+            expect(tokens_yaml["https://api.some-domain.com"][:organization]).to be == "organization-id-1"
+          end
 
-        it "removes the space from the token file" do
-          subject
-          refreshed_tokens = YAML.load_file(File.expand_path(tokens_file_path))
-          expect(refreshed_tokens["https://api.some-domain.com"][:space]).to be_nil
-        end
+          it "prints out that it is switching to that organization" do
+            subject
+            expect(output).to say("Switching to organization #{organization.name}")
+          end
 
-      end
+          context "and a different organization and space in the token file" do
+            let(:input) { {:organization => organizations.last} }
 
-      context "and the same organization and a space in the token file" do
-        before do
-          write_token_file({:organization => "organization-id-1", :space => "should-not-be-removed"})
-        end
+            before do
+              write_token_file({:organization => "organization-id-1", :space => "should-be-removed"})
+            end
 
-        it "does not remove the space from the token file" do
-          subject
-          expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == "should-not-be-removed"
-        end
-      end
+            it "removes the space from the token file" do
+              subject
+              refreshed_tokens = YAML.load_file(File.expand_path(tokens_file_path))
+              expect(refreshed_tokens["https://api.some-domain.com"][:space]).to be_nil
+            end
 
-    end
+          end
 
-    context "without an organization in the input" do
-      let(:input) { {} }
+          context "and the same organization and a space in the token file" do
+            before do
+              write_token_file({:organization => "organization-id-1", :space => "should-not-be-removed"})
+            end
 
-      context "with an organization in the config file" do
-        it "should not reprompt for organization" do
-          dont_allow_ask("Organization", anything)
-          subject
-        end
+            it "does not remove the space from the token file" do
+              subject
+              expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == "should-not-be-removed"
+            end
+          end
 
-        it "sets the organization in the token file" do
-          subject
-          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 { stub(organization).users { raise CFoundry::APIError } }
+        context "without an organization in the input" do
+          let(:input) { {} }
 
-          it "asks the user for an organization" do
-            mock_ask("Organization", anything) { organization }
-            subject
+          context "with an organization in the config file" do
+            it "should not reprompt for organization" do
+              dont_allow_ask("Organization", anything)
+              subject
+            end
+
+            it "sets the organization in the token file" do
+              subject
+              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) }
+
+              it "asks the user for an organization" do
+                mock_ask("Organization", anything) { organization }
+                subject
+              end
+            end
           end
-        end
-      end
 
-      context "without an organization in the config file" do
-        before { write_token_file({}) }
+          context "without an organization in the config file" do
+            before { write_token_file({}) }
 
-        it "prompts for the organization" do
-          mock_ask("Organization", anything) { organization }
-          subject
+            it "prompts for the organization" do
+              mock_ask("Organization", anything) { organization }
+              subject
 
-          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
+              mock_ask("Organization", anything) { organization }
 
-          subject
-          expect(tokens_yaml["https://api.some-domain.com"][:organization]).to be == "organization-id-1"
-        end
+              subject
+              expect(tokens_yaml["https://api.some-domain.com"][:organization]).to be == "organization-id-1"
+            end
 
-        context "when the user has no organizations" do
-          let(:client) { fake_client :organizations => [] }
+            context "when the user has no organizations" do
+              let(:client) { fake_client :organizations => [] }
 
-          it "tells the user to create one by raising a UserFriendlyError" do
-            expect { subject }.to raise_error(CF::UserFriendlyError, /There are no organizations/)
+              it "tells the user to create one by raising a UserFriendlyError" do
+                expect { subject }.to raise_error(CF::UserFriendlyError, /There are no organizations/)
+              end
+            end
           end
         end
       end

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

@@ -1,142 +1,141 @@
 require "spec_helper"
-require "webmock/rspec"
-require "cf/cli/populators/space"
-
-describe CF::Populators::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) {
-      [fake(:space, :name => "Development", :guid => "space-id-1", :developers => [user]),
-        fake(:space, :name => "Staging", :guid => "space-id-2")]
-    }
-
-    let(:user) { stub! }
-    let(:organization) { fake(:organization, :name => "My Org", :guid => "organization-id-1", :users => [user], :spaces => spaces) }
-    let(:space) { spaces.first }
-    let(:client) do
-      fake_client :organizations => [organization]
-    end
-
-    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)) }
-    let(:populator) { CF::Populators::Space.new(inputs, organization) }
 
-    before do
-      stub(client).current_user { user }
-      stub(client).space { space }
-      any_instance_of(described_class) do |instance|
-        stub(instance).client { client }
-      end
+module CF
+  module Populators
 
-      write_token_file({:space => "space-id-1", :organization => "organization-id-1"})
-    end
+    describe Space do
+      stub_home_dir_with { "#{SPEC_ROOT}/fixtures/fake_home_dirs/new" }
 
-    subject do
-      capture_output { populator.populate_and_save! }
-    end
+      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")]
+        }
 
-    it "updates the client with the new space" do
-      write_token_file({:space => "space-id-2"})
-      any_instance_of(described_class) do |instance|
-        stub.proxy(instance).client
-      end
-      populator.client.current_space.guid.should == "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]
+        end
 
-      subject
+        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)) }
+        let(:populator) { CF::Populators::Space.new(inputs, organization) }
 
-      populator.client.current_space.guid.should == "space-id-1"
-    end
+        before do
+          client.stub(:current_user).and_return(user)
+          client.stub(:space).and_return(space)
+          described_class.any_instance.stub(:client).and_return(client)
 
-    it "returns the space" do
-      subject.should == space
-    end
+          write_token_file({:space => "space-id-1", :organization => "organization-id-1"})
+        end
 
-    describe "mothership input arguments" do
-      let(:inputs) do
-        Mothership::Inputs.new(nil, nil, input_hash).tap do |input|
-          mock(input).[](:space, organization) { space }
-          stub(input).[](anything) { space }
+        subject do
+          capture_output { populator.populate_and_save! }
         end
-      end
 
-      it "passes through extra arguments to the input call" do
-        subject
-      end
-    end
+        it "updates the client with the new space" do
+          write_token_file({:space => "space-id-2"})
+          described_class.any_instance.unstub(:client)
+          populator.client.current_space.guid.should == "space-id-2"
 
-    context "with a space in the input" do
-      let(:input_hash) { {:space => space} }
-      before { write_token_file({:space => "space-id-2"}) }
+          subject
 
-      it "uses that space" do
-        subject.should == space
-      end
+          populator.client.current_space.guid.should == "space-id-1"
+        end
 
-      it "should not reprompt for space" do
-        dont_allow_ask("Space", anything)
-        subject
-      end
+        it "returns the space" do
+          subject.should == space
+        end
 
-      it "sets the space in the token file" do
-        subject
-        expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == "space-id-1"
-      end
+        describe "mothership input arguments" do
+          let(:inputs) do
+            Mothership::Inputs.new(nil, nil, input_hash).tap do |input|
+              input.should_receive(:[]).with(:space, organization).and_return(space)
+              input.stub(:[]).and_return(space)
+            end
+          end
 
-      it "prints out that it is switching to that space" do
-        subject
-        expect(output).to say("Switching to space #{space.name}")
-      end
-    end
+          it "passes through extra arguments to the input call" do
+            subject
+          end
+        end
 
-    context "without a space in the input" do
-      let(:input_hash) { {} }
+        context "with a space in the input" do
+          let(:input_hash) { {:space => space} }
+          before { write_token_file({:space => "space-id-2"}) }
 
-      context "with a space in the config file" do
-        it "should not reprompt for space" do
-          dont_allow_ask("Space", anything)
-          subject
-        end
+          it "uses that space" do
+            subject.should == space
+          end
 
-        it "sets the space in the token file" do
-          subject
-          expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == "space-id-1"
-        end
+          it "should not reprompt for space" do
+            dont_allow_ask("Space", anything)
+            subject
+          end
 
-        context "but that space doesn't exist anymore (not valid)" do
-          before { stub(space).developers { raise CFoundry::APIError } }
+          it "sets the space in the token file" do
+            subject
+            expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == "space-id-1"
+          end
 
-          it "asks the user for an space" do
-            mock_ask("Space", anything) { space }
+          it "prints out that it is switching to that space" do
             subject
+            expect(output).to say("Switching to space #{space.name}")
           end
         end
-      end
 
-      context "without a space in the config file" do
-        before { write_token_file({}) }
+        context "without a space in the input" do
+          let(:input_hash) { {} }
 
-        it "prompts for the space" do
-          mock_ask("Space", anything) { space }
-          subject
+          context "with a space in the config file" do
+            it "should not reprompt for space" do
+              dont_allow_ask("Space", anything)
+              subject
+            end
 
-          expect(output).to say("Switching to space #{space.name}")
-        end
+            it "sets the space in the token file" do
+              subject
+              expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == "space-id-1"
+            end
 
-        it "sets the space in the token file" do
-          mock_ask("Space", anything) { space }
+            context "but that space doesn't exist anymore (not valid)" do
+              before { space.stub(:developers).and_raise(CFoundry::APIError) }
 
-          subject
-          expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == "space-id-1"
-        end
+              it "asks the user for an space" do
+                mock_ask("Space", anything) { space }
+                subject
+              end
+            end
+          end
+
+          context "without a space in the config file" do
+            before { write_token_file({}) }
+
+            it "prompts for the space" do
+              mock_ask("Space", anything) { space }
+              subject
+
+              expect(output).to say("Switching to space #{space.name}")
+            end
+
+            it "sets the space in the token file" do
+              mock_ask("Space", anything) { space }
+
+              subject
+              expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == "space-id-1"
+            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]) }
+            context "when the user has no spaces in that organization" do
+              let(:organization) { fake(:organization, :name => "My Org", :guid => "organization-id-1", :users => [user]) }
 
-          it "tells the user to create one by raising a UserFriendlyError" do
-            expect { subject }.to raise_error(CF::UserFriendlyError, /There are no spaces/)
+              it "tells the user to create one by raising a UserFriendlyError" do
+                expect { subject }.to raise_error(CF::UserFriendlyError, /There are no spaces/)
+              end
+            end
           end
         end
       end