brightbox-cli 1.2.2 → 1.3.0

data/spec/unit/brightbox/bb_config/has_multiple_clients_spec.rb

@@ -18,7 +18,7 @@ describe Brightbox::BBConfig do
         EOS
       end
       it "is true" do
-        expect(config.has_multiple_clients?).to be_true
+        expect(config.has_multiple_clients?).to be true
       end
     end
 
@@ -33,7 +33,7 @@ describe Brightbox::BBConfig do
         EOS
       end
       it "is false" do
-        expect(config.has_multiple_clients?).to be_false
+        expect(config.has_multiple_clients?).to be false
       end
     end
   end

data/spec/unit/brightbox/bb_config/renew_tokens_spec.rb

@@ -33,7 +33,7 @@ describe Brightbox::BBConfig do
 
       it "caches the new tokens" do
         # Access token
-        expect(File.exists?(@config.access_token_filename)).to be_true
+        expect(File.exist?(@config.access_token_filename)).to be true
 
         expect(cached_access_token(@config)).to eql(@new_access_token)
 
@@ -55,7 +55,6 @@ describe Brightbox::BBConfig do
         @new_access_token = "0d09cf23393aeb039b7abe6fd15339108095e927"
         @new_refresh_token = "53779449e94964eefb10daaa4807fd5f007b5211"
 
-
         # If we are prompting then the refresh token has failed
         expect(@config).to_not receive(:prompt_for_password)
         @output = FauxIO.new { @config.renew_tokens }
@@ -63,7 +62,7 @@ describe Brightbox::BBConfig do
 
       it "caches the new tokens" do
         # Access token
-        expect(File.exists?(@config.access_token_filename)).to be_true
+        expect(File.exist?(@config.access_token_filename)).to be true
 
         # NOTE The cached to disk version is filtered by VCR when testing
         expect(cached_access_token(@config)).to eql(@new_access_token)
@@ -91,7 +90,7 @@ describe Brightbox::BBConfig do
 
       it "caches the new tokens" do
         # Access token
-        expect(File.exists?(@config.access_token_filename)).to be_true
+        expect(File.exist?(@config.access_token_filename)).to be true
 
         # NOTE The cached to disk version is filtered by VCR when testing
         expect(cached_access_token(@config)).to eql(@new_access_token)
@@ -112,7 +111,7 @@ describe Brightbox::BBConfig do
       end
 
       it "caches a new access token" do
-        expect(File.exists?(@config.access_token_filename)).to be_true
+        expect(File.exist?(@config.access_token_filename)).to be true
         expect(cached_access_token(@config)).to eql("5f3fd8fe25388fc9b801afc15a23d3991c68257d")
       end
     end

data/spec/unit/brightbox/bb_config/save_spec.rb

@@ -6,7 +6,7 @@ describe Brightbox::BBConfig do
     let(:config) { Brightbox::BBConfig.new }
 
     before do
-      Ini.any_instance.should_not_receive(:write)
+      expect_any_instance_of(Ini).not_to receive(:write)
       expect(config).to_not be_dirty
     end
 
@@ -24,7 +24,7 @@ describe Brightbox::BBConfig do
     let(:config) { Brightbox::BBConfig.new }
 
     before do
-      Ini.any_instance.should_receive(:write)
+      expect_any_instance_of(Ini).to receive(:write)
       config.dirty!
     end
 

data/spec/unit/brightbox/bb_config/to_fog_spec.rb

@@ -10,9 +10,9 @@ describe Brightbox::BBConfig do
       let(:contents) { "" }
 
       it "raises an error" do
-        expect {
+        expect do
           fog_config.to_fog
-        }.to raise_error(Brightbox::BBConfigError)
+        end.to raise_error(Brightbox::BBConfigError)
       end
     end
 

data/spec/unit/brightbox/bb_config/using_client_spec.rb

@@ -29,9 +29,9 @@ describe Brightbox::BBConfig do
       end
 
       it "does not raise an error" do
-        expect {
+        expect do
           Brightbox::BBConfig.new.using_application?
-        }.to raise_error(Brightbox::NoSelectedClientError, error_message)
+        end.to raise_error(Brightbox::NoSelectedClientError, error_message)
       end
     end
 
@@ -40,7 +40,7 @@ describe Brightbox::BBConfig do
 
       it "returns true" do
         config.client_name = client_name
-        expect(config.using_application?).to be_true
+        expect(config.using_application?).to be true
       end
     end
 
@@ -49,7 +49,7 @@ describe Brightbox::BBConfig do
 
       it "returns false" do
         config.client_name = client_name
-        expect(config.using_application?).to be_false
+        expect(config.using_application?).to be false
       end
     end
 
@@ -58,7 +58,7 @@ describe Brightbox::BBConfig do
 
       it "returns true" do
         config.client_name = client_name
-        expect(config.using_application?).to be_true
+        expect(config.using_application?).to be true
       end
     end
   end
@@ -70,9 +70,9 @@ describe Brightbox::BBConfig do
       end
 
       it "does not raise an error" do
-        expect {
+        expect do
           Brightbox::BBConfig.new.using_api_client?
-        }.to raise_error(Brightbox::NoSelectedClientError, error_message)
+        end.to raise_error(Brightbox::NoSelectedClientError, error_message)
       end
     end
 
@@ -81,7 +81,7 @@ describe Brightbox::BBConfig do
 
       it "returns false" do
         config.client_name = client_name
-        expect(config.using_api_client?).to be_false
+        expect(config.using_api_client?).to be false
       end
     end
 
@@ -90,7 +90,7 @@ describe Brightbox::BBConfig do
 
       it "returns true" do
         config.client_name = client_name
-        expect(config.using_api_client?).to be_true
+        expect(config.using_api_client?).to be true
       end
     end
 
@@ -99,7 +99,7 @@ describe Brightbox::BBConfig do
 
       it "returns false" do
         config.client_name = client_name
-        expect(config.using_api_client?).to be_false
+        expect(config.using_api_client?).to be false
       end
     end
   end

data/spec/unit/brightbox/collaborating_account/resource_type_spec.rb

@@ -28,7 +28,7 @@ describe Brightbox::CollaboratingAccount do
       let(:initial_model) { owned_account }
 
       it "returns true" do
-        expect(account.account?).to be_true
+        expect(account.account?).to be true
       end
     end
 
@@ -36,7 +36,7 @@ describe Brightbox::CollaboratingAccount do
       let(:initial_model) { active_collaboration }
 
       it "returns false'" do
-        expect(account.account?).to be_false
+        expect(account.account?).to be false
       end
     end
   end
@@ -46,7 +46,7 @@ describe Brightbox::CollaboratingAccount do
       let(:initial_model) { owned_account }
 
       it "returns false" do
-        expect(account.collaboration?).to be_false
+        expect(account.collaboration?).to be false
       end
     end
 
@@ -54,7 +54,7 @@ describe Brightbox::CollaboratingAccount do
       let(:initial_model) { active_collaboration }
 
       it "returns true'" do
-        expect(account.collaboration?).to be_true
+        expect(account.collaboration?).to be true
       end
     end
   end

data/spec/unit/brightbox/collaborating_account_spec.rb

@@ -11,7 +11,7 @@ describe Brightbox::CollaboratingAccount do
 
   it_behaves_like "a wrapped API resource"
 
-  it { should respond_to(:ram_free) }
-  it { should respond_to(:cloud_ip_limit) }
-  it { should respond_to(:lb_limit) }
+  it { is_expected.to respond_to(:ram_free) }
+  it { is_expected.to respond_to(:cloud_ip_limit) }
+  it { is_expected.to respond_to(:lb_limit) }
 end

data/spec/unit/brightbox/config/api_client/to_fog_spec.rb

@@ -42,7 +42,7 @@ describe Brightbox::Config::ApiClient do
       end
 
       it "sets persistent correctly" do
-        expect(for_fog[:persistent]).to be_true
+        expect(for_fog[:persistent]).to be true
       end
     end
 
@@ -78,7 +78,7 @@ describe Brightbox::Config::ApiClient do
       end
 
       it "sets persistent correctly" do
-        expect(for_fog[:persistent]).to be_true
+        expect(for_fog[:persistent]).to be false
       end
     end
 

data/spec/unit/brightbox/config/api_client/valid_spec.rb

@@ -19,7 +19,7 @@ describe Brightbox::Config::ApiClient do
       end
 
       it "is valid" do
-       expect(section).to be_valid
+        expect(section).to be_valid
       end
     end
 
@@ -35,7 +35,7 @@ describe Brightbox::Config::ApiClient do
       end
 
       it "is valid" do
-       expect(section).to be_valid
+        expect(section).to be_valid
       end
     end
 
@@ -49,7 +49,7 @@ describe Brightbox::Config::ApiClient do
       end
 
       it "is invalid" do
-       expect(section).to_not be_valid
+        expect(section).to_not be_valid
       end
     end
 
@@ -63,7 +63,7 @@ describe Brightbox::Config::ApiClient do
       end
 
       it "is invalid" do
-       expect(section).to_not be_valid
+        expect(section).to_not be_valid
       end
     end
 
@@ -77,7 +77,7 @@ describe Brightbox::Config::ApiClient do
       end
 
       it "is invalid" do
-       expect(section).to_not be_valid
+        expect(section).to_not be_valid
       end
     end
   end

data/spec/unit/brightbox/config/section_name_deduplicator_spec.rb

@@ -33,7 +33,7 @@ describe Brightbox::Config::SectionNameDeduplicator do
 
     context "when name has been deduped before" do
       let(:name) { "dev" }
-      let(:in_use) { ["dev", "dev_1", "dev_2"] }
+      let(:in_use) { %w(dev dev_1 dev_2) }
 
       it "returns a deduplicated name" do
         expect(deduper.next).to eql("dev_3")

data/spec/unit/brightbox/config/to_fog_spec.rb

@@ -9,9 +9,9 @@ describe Brightbox::BBConfig do
       let(:contents) { "" }
 
       it "raises an error" do
-        expect {
+        expect do
           fog_config
-        }.to raise_error(Brightbox::BBConfigError)
+        end.to raise_error(Brightbox::BBConfigError)
       end
     end
 
@@ -27,7 +27,7 @@ describe Brightbox::BBConfig do
       let(:contents) { USER_APP_CONFIG_CONTENTS }
 
       it "includes the password" do
-        pending "context is wrong to pass require values through"
+        skip "context is wrong to pass require values through"
         expect(fog_config).to have_key(:brightbox_password)
       end
     end

data/spec/unit/brightbox/config/user_application/to_fog_spec.rb

@@ -43,7 +43,7 @@ describe Brightbox::Config::UserApplication do
       end
 
       it "sets persistent correctly" do
-        expect(for_fog[:persistent]).to be_true
+        expect(for_fog[:persistent]).to be true
       end
     end
 
@@ -81,7 +81,7 @@ describe Brightbox::Config::UserApplication do
       end
 
       it "sets persistent correctly" do
-        expect(for_fog[:persistent]).to be_true
+        expect(for_fog[:persistent]).to be false
       end
     end
 

data/spec/unit/brightbox/config/user_application/valid_spec.rb

@@ -20,7 +20,7 @@ describe Brightbox::Config::UserApplication do
       end
 
       it "is valid" do
-       expect(section).to be_valid
+        expect(section).to be_valid
       end
     end
 
@@ -37,7 +37,7 @@ describe Brightbox::Config::UserApplication do
       end
 
       it "is valid" do
-       expect(section).to be_valid
+        expect(section).to be_valid
       end
     end
 
@@ -52,7 +52,7 @@ describe Brightbox::Config::UserApplication do
       end
 
       it "is invalid" do
-       expect(section).to_not be_valid
+        expect(section).to_not be_valid
       end
     end
 
@@ -67,7 +67,7 @@ describe Brightbox::Config::UserApplication do
       end
 
       it "is invalid" do
-       expect(section).to_not be_valid
+        expect(section).to_not be_valid
       end
     end
 
@@ -82,7 +82,7 @@ describe Brightbox::Config::UserApplication do
       end
 
       it "is invalid" do
-       expect(section).to_not be_valid
+        expect(section).to_not be_valid
       end
     end
 
@@ -97,7 +97,7 @@ describe Brightbox::Config::UserApplication do
       end
 
       it "is invalid" do
-       expect(section).to_not be_valid
+        expect(section).to_not be_valid
       end
     end
   end

data/spec/unit/brightbox/connection_manager/fetch_connection_spec.rb

@@ -15,13 +15,13 @@ describe Brightbox::ConnectionManager, "#fetch_connection" do
 
   context "when not requesting a scoped connection" do
     it "returns a fog compute instance" do
-      connection_manager.fetch_connection(false).should be_kind_of(Fog::Compute::Brightbox::Real)
+      expect(connection_manager.fetch_connection(false)).to be_kind_of(Fog::Compute::Brightbox::Real)
     end
 
     it "returns a connection without account scope" do
       connection = connection_manager.fetch_connection(false)
-      connection.should_not be_nil
-      connection.scoped_account.should be_nil
+      expect(connection).not_to be_nil
+      expect(connection.scoped_account).to be_nil
     end
   end
 
@@ -29,13 +29,13 @@ describe Brightbox::ConnectionManager, "#fetch_connection" do
     context "when a connection exists" do
       it "upgrades existing connection with scoped account" do
         connection = connection_manager.fetch_connection(false)
-        connection.should_not be_nil
+        expect(connection).not_to be_nil
 
         expect($config).to receive(:account).and_return("acc-abcde")
         connection2 = connection_manager.fetch_connection(true)
-        connection2.should == connection
-        connection2.scoped_account.should_not be_nil
-        connection2.scoped_account.should == "acc-abcde"
+        expect(connection2).to eq(connection)
+        expect(connection2.scoped_account).not_to be_nil
+        expect(connection2.scoped_account).to eq("acc-abcde")
       end
     end
   end
@@ -43,30 +43,30 @@ describe Brightbox::ConnectionManager, "#fetch_connection" do
   context "when a default account setting is set in config" do
     let(:default_account) { "acc-12345" }
     let(:selected_config) do
-      {"default_account" => default_account}
+      { "default_account" => default_account }
     end
 
     it "selects configured account" do
-      pending "Fails out of sequence, mocked config incorrect"
-      $config.stubs(:selected_config).returns({ 'default_account' => "acc-12345"})
+      skip "Fails out of sequence, mocked config incorrect"
+      $config.stubs(:selected_config).returns('default_account' => "acc-12345")
       connection = connection_manager.fetch_connection(true)
-      connection.should_not be_nil
-      connection.scoped_account.should == "acc-12345"
+      expect(connection).not_to be_nil
+      expect(connection.scoped_account).to eq("acc-12345")
     end
   end
 
   context "when user has one account" do
     it "selects that account" do
-      pending "Fails out of sequence, mocked config incorrect"
-      $config.unstub(:selected_config)
-      mock_account = mock()
+      skip "Fails out of sequence, mocked config incorrect"
+      allow($config).to receive(:selected_config).and_call_original
+      mock_account = double
       mock_account.expects(:id).returns("acc-xyg")
 
       Brightbox::Account.expects(:all).returns([mock_account])
 
       connection = connection_manager.fetch_connection(true)
-      connection.should_not be_nil
-      connection.scoped_account.should == "acc-xyg"
+      expect(connection).not_to be_nil
+      expect(connection.scoped_account).to eq("acc-xyg")
     end
   end
 end

data/spec/unit/brightbox/firewall_policy/apply_to_spec.rb

@@ -5,8 +5,8 @@ describe Brightbox::FirewallPolicy do
   describe "#apply_to", :vcr do
 
     it "should apply firewall policy" do
-      lambda {
-        params = { :name => "rspec_tests_apply"}
+      expect do
+        params = { :name => "rspec_tests_apply" }
         group = Brightbox::ServerGroup.create(params)
         firewall_options = {
           :name => "rspec_firewall_policy_apply"
@@ -14,7 +14,7 @@ describe Brightbox::FirewallPolicy do
         firewall_policy = Brightbox::FirewallPolicy.create(firewall_options)
         firewall_policy.apply_to(group.id)
         group.destroy
-      }.should_not raise_error
+      end.not_to raise_error
     end
   end
 end

data/spec/unit/brightbox/firewall_policy/create_spec.rb

@@ -5,22 +5,22 @@ describe Brightbox::FirewallPolicy do
   describe "#create", :vcr do
 
     it "should create firewall policy" do
-      params = { :name => "rspec_tests"}
+      params = { :name => "rspec_tests" }
       @group = Brightbox::ServerGroup.create(params)
-      lambda do
+      expect do
         firewall_options = {
           :name => "rspec_firewall_policy",
           :server_group_id => @group.id
         }
         @firewall_policy = Brightbox::FirewallPolicy.create(firewall_options)
-      end.should_not raise_error
+      end.not_to raise_error
 
       output = FauxIO.new do
-        Brightbox.render_table([@firewall_policy],:vertical => true)
+        Brightbox.render_table([@firewall_policy], :vertical => true)
       end
 
       expect(output.stdout).to match(/rspec_firewall_policy/)
-      @group.destroy()
+      @group.destroy
     end
   end
 end

data/spec/unit/brightbox/firewall_policy/destroy_spec.rb

@@ -4,17 +4,17 @@ describe Brightbox::FirewallPolicy do
 
   describe "#destroy", :vcr do
     it "should destroy firewall policy" do
-      params = { :name => "rspec_tests"}
+      params = { :name => "rspec_tests" }
       @group = Brightbox::ServerGroup.create(params)
-      lambda do
+      expect do
         firewall_options = {
           :name => "rspec_firewall_policy",
           :server_group_id => @group.id
         }
         @firewall_policy = Brightbox::FirewallPolicy.create(firewall_options)
         @firewall_policy.destroy
-      end.should_not raise_error
-      @group.destroy()
+      end.not_to raise_error
+      @group.destroy
     end
   end
 end

data/spec/unit/brightbox/firewall_policy/find_or_call_spec.rb

@@ -14,7 +14,7 @@ describe Brightbox::FirewallPolicy do
       it "should show firewall policy", :vcr do
         output = FauxIO.new do
           firewall_policy = Brightbox::FirewallPolicy.find_or_call([@policy.id])
-          Brightbox.render_table(firewall_policy,:vertical => true)
+          Brightbox.render_table(firewall_policy, :vertical => true)
         end
         expect(output.stdout).to include(@policy.id)
       end

data/spec/unit/brightbox/firewall_policy/find_spec.rb

@@ -13,7 +13,7 @@ describe Brightbox::FirewallPolicy do
       it "should list firewall policy", :vcr do
         output = FauxIO.new do
           firewall_policies = Brightbox::FirewallPolicy.find(:all)
-          Brightbox.render_table(firewall_policies,:vertical => true)
+          Brightbox.render_table(firewall_policies, :vertical => true)
         end
 
         expect(output.stdout).to include(@policy.id)

data/spec/unit/brightbox/firewall_rule/create_spec.rb

@@ -20,7 +20,7 @@ describe Brightbox::FirewallRule do
       it "creates the rule successfully", :vcr do
         @rule = Brightbox::FirewallRule.create(@rule_options)
         output = FauxIO.new do
-          Brightbox.render_table([@rule], {:vertical => true})
+          Brightbox.render_table([@rule], :vertical => true)
         end
 
         expect(output.stdout).to include(@rule.id)

data/spec/unit/brightbox/firewall_rule/destroy_spec.rb

@@ -18,9 +18,9 @@ describe Brightbox::FirewallRule do
       end
 
       it "destroys a rule" do
-        expect {
+        expect do
           @rule.destroy
-        }.to_not raise_error
+        end.to_not raise_error
       end
     end
   end

data/spec/unit/brightbox/firewall_rule/find_spec.rb

@@ -18,9 +18,9 @@ describe Brightbox::FirewallRule do
       end
 
       it "can display the result" do
-        expect {
+        expect do
           @rule = Brightbox::FirewallRule.find(@rule.id)
-        }.to_not raise_error
+        end.to_not raise_error
 
         display_options = {
           :fields => [
@@ -33,7 +33,7 @@ describe Brightbox::FirewallRule do
             :icmp_type,
             :firewall_policy
           ],
-            :vertical => true
+          :vertical => true
         }
 
         output = FauxIO.new do

data/spec/unit/brightbox/firewall_rule/from_policy_spec.rb

@@ -21,8 +21,8 @@ describe Brightbox::FirewallRule do
       end
 
       it "lists all rules" do
-        # FIXME from_policy does not seem to reload from API so uses a stale
-        # representation of the rules (Policy creation above)
+        # FIXME: from_policy does not seem to reload from API so uses a stale
+        #   representation of the rules (Policy creation above)
         @policy.reload
         @policy_rules = Brightbox::FirewallRules.from_policy(@policy)