beaker 5.6.0 → 5.8.0

data/spec/beaker/dsl/roles_spec.rb

@@ -21,13 +21,13 @@ describe ClassMixedWithDSLRoles do
     it 'returns an array of hosts that are agents' do
       @hosts = [agent1, agent2, master]
       expect(subject).to receive(:hosts).and_return(hosts)
-      expect(subject.agents).to be == [agent1, agent2, master]
+      expect(subject.agents).to eq [agent1, agent2, master]
     end
 
     it 'and an empty array when none match' do
       @hosts = [db, custom]
       expect(subject).to receive(:hosts).and_return(hosts)
-      expect(subject.agents).to be == []
+      expect(subject.agents).to eq []
     end
   end
 
@@ -35,7 +35,7 @@ describe ClassMixedWithDSLRoles do
     it 'returns the master if there is one' do
       @hosts = [master, agent1]
       expect(subject).to receive(:hosts).and_return(hosts)
-      expect(subject.master).to be == master
+      expect(subject.master).to eq master
     end
 
     it 'raises an error if there is more than one master' do
@@ -56,7 +56,7 @@ describe ClassMixedWithDSLRoles do
     it 'returns the dashboard if there is one' do
       @hosts = [a_and_dash, agent1]
       expect(subject).to receive(:hosts).and_return(hosts)
-      expect(subject.dashboard).to be == a_and_dash
+      expect(subject.dashboard).to eq a_and_dash
     end
 
     it 'raises an error if there is more than one dashboard' do
@@ -83,7 +83,7 @@ describe ClassMixedWithDSLRoles do
     it 'returns the database if there is one' do
       @hosts = [db, agent1]
       expect(subject).to receive(:hosts).and_return(hosts)
-      expect(subject.database).to be == db
+      expect(subject.database).to eq db
     end
 
     it 'raises an error if there is more than one database' do
@@ -108,25 +108,25 @@ describe ClassMixedWithDSLRoles do
 
   describe '#not_controller' do
     it 'returns true when a host does not have the roles master/database/dashboard' do
-      expect(subject.not_controller(agent1)).to be == true
+      expect(subject.not_controller(agent1)).to eq true
     end
 
     it 'returns false when a host has one of the roles master/database/dashboard' do
-      expect(subject.not_controller(a_and_dash)).to be == false
+      expect(subject.not_controller(a_and_dash)).to eq false
     end
   end
 
   describe '#agent_only' do
     it 'returns true when a host has the single role agent' do
-      expect(subject.agent_only(agent1)).to be == true
+      expect(subject.agent_only(agent1)).to eq true
     end
 
     it 'returns false when a host has more than a single role' do
-      expect(subject.agent_only(a_and_dash)).to be == false
+      expect(subject.agent_only(a_and_dash)).to eq false
     end
 
     it 'returns false when a host has the role master' do
-      expect(subject.agent_only(master)).to be == false
+      expect(subject.agent_only(master)).to eq false
     end
   end
 
@@ -328,7 +328,7 @@ describe ClassMixedWithDSLRoles do
     it 'returns the default host when one is specified' do
       @hosts = [db, agent1, agent2, default, master]
       expect(subject).to receive(:hosts).once.and_return(hosts)
-      expect(subject.default).to be == default
+      expect(subject.default).to eq default
     end
 
     it 'raises an error if there is more than one default' do
@@ -377,7 +377,7 @@ describe ClassMixedWithDSLRoles do
       test_role = "custom_role"
       subject.add_role_def(test_role)
       expect(subject).to respond_to test_role
-      expect(subject.send(test_role)).to be == @hosts[2]
+      expect(subject.send(test_role)).to eq @hosts[2]
       subject.class.send(:undef_method, test_role)
     end
 
@@ -387,7 +387,7 @@ describe ClassMixedWithDSLRoles do
       test_role = "custom_role"
       subject.add_role_def(test_role)
       expect(subject).to respond_to test_role
-      expect(subject.send(test_role)).to be == [@hosts[2], @hosts[3]]
+      expect(subject.send(test_role)).to eq [@hosts[2], @hosts[3]]
       subject.class.send(:undef_method, test_role)
     end
   end
@@ -397,8 +397,8 @@ describe ClassMixedWithDSLRoles do
       @hosts = [agent1, agent2]
       # expect( subject ).to receive( :hosts ).and_return( hosts )
       expect(subject).to receive(:hosts).twice.and_return(hosts)
-      expect(subject.any_hosts_as?("agent")).to be == true
-      expect(subject.any_hosts_as?("custom_role")).to be == false
+      expect(subject.any_hosts_as?("agent")).to eq true
+      expect(subject.any_hosts_as?("custom_role")).to eq false
     end
   end
 end

data/spec/beaker/dsl/structure_spec.rb

@@ -370,13 +370,13 @@ describe ClassMixedWithDSLStructure do
     it 'returns an empty array if there are no applicable hosts' do
       hosts = [{ 'thing' => 'foo' }, { 'thing' => 'bar' }]
 
-      expect(subject.select_hosts({ 'thing' => 'nope' }, hosts)).to be == []
+      expect(subject.select_hosts({ 'thing' => 'nope' }, hosts)).to eq []
     end
 
     it 'selects hosts that match a list of criteria' do
       hosts = [{ 'thing' => 'foo' }, { 'thing' => 'bar' }, { 'thing' => 'baz' }]
 
-      expect(subject.select_hosts({ :thing => %w[foo baz] }, hosts)).to be == [{ 'thing' => 'foo' }, { 'thing' => 'baz' }]
+      expect(subject.select_hosts({ :thing => %w[foo baz] }, hosts)).to eq [{ 'thing' => 'foo' }, { 'thing' => 'baz' }]
     end
 
     it 'selects hosts when a passed block returns true' do
@@ -396,7 +396,7 @@ describe ClassMixedWithDSLStructure do
       selected_hosts = subject.select_hosts 'platform' => 'solaris' do |host|
         subject.on(host, '/sbin/zonename').stdout.include?(':global')
       end
-      expect(selected_hosts).to be == [host1]
+      expect(selected_hosts).to eq [host1]
     end
   end
 end

data/spec/beaker/host/pswindows/exec_spec.rb

@@ -85,17 +85,17 @@ module Beaker
       let(:host) { { 'pathseparator' => ':' } }
 
       it 'returns a blank string if theres no env' do
-        expect(instance.environment_string({})).to be == ''
+        expect(instance.environment_string({})).to eq ''
       end
 
       it 'takes an env hash with var_name/value pairs' do
         expect(instance.environment_string({ :HOME => '/', :http_proxy => 'http://foo' }))
-          .to be == 'set "HOME=/" && set "http_proxy=http://foo" && set "HTTP_PROXY=http://foo" && '
+          .to eq 'set "HOME=/" && set "http_proxy=http://foo" && set "HTTP_PROXY=http://foo" && '
       end
 
       it 'takes an env hash with var_name/value[Array] pairs' do
         expect(instance.environment_string({ :LD_PATH => ['/', '/tmp'] }))
-          .to be == "set \"LD_PATH=/:/tmp\" && "
+          .to eq "set \"LD_PATH=/:/tmp\" && "
       end
     end
 

data/spec/beaker/host/unix/exec_spec.rb

@@ -62,17 +62,17 @@ module Beaker
 
       it 'returns a blank string if theres no env' do
         expect(instance).not_to receive(:is_powershell?)
-        expect(instance.environment_string({})).to be == ''
+        expect(instance.environment_string({})).to eq ''
       end
 
       it 'takes an env hash with var_name/value pairs' do
         expect(instance.environment_string({ :HOME => '/', :http_proxy => 'http://foo' }))
-          .to be == 'env HOME="/" http_proxy="http://foo" HTTP_PROXY="http://foo"'
+          .to eq 'env HOME="/" http_proxy="http://foo" HTTP_PROXY="http://foo"'
       end
 
       it 'takes an env hash with var_name/value[Array] pairs' do
         expect(instance.environment_string({ :LD_PATH => ['/', '/tmp'] }))
-          .to be == "env LD_PATH=\"/:/tmp\""
+          .to eq "env LD_PATH=\"/:/tmp\""
       end
     end
 

data/spec/beaker/host/unix/file_spec.rb

@@ -133,6 +133,14 @@ module Beaker
         expect(filename).to be === correct
       end
 
+      it 'builds the filename correctly for amazon-based platforms' do
+        @platform = 'amazon-2023-x86_64'
+        allow(instance).to receive(:is_pe?).and_return(true)
+        filename = instance.repo_filename('pkg_name', 'pkg_version')
+        correct = 'pl-pkg_name-pkg_version-amazon-2023-x86_64.repo'
+        expect(filename).to be === correct
+      end
+
       it 'builds the filename correctly for debian-based platforms' do
         @platform = 'debian-8-x86_64'
         filename = instance.repo_filename('pkg_name', 'pkg_version10')

data/spec/beaker/host/unix/pkg_spec.rb

@@ -171,7 +171,7 @@ module Beaker
           pkg = 'pkg'
           expect(Beaker::Command).to receive(:new).with("apt-get install --force-yes  -y #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
           expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
-          expect(instance.install_package(pkg)).to be == "hello"
+          expect(instance.install_package(pkg)).to eq "hello"
         end
       end
 
@@ -180,7 +180,7 @@ module Beaker
         pkg = 'fedora_package'
         expect(Beaker::Command).to receive(:new).with("dnf -y  install #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
         expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
-        expect(instance.install_package(pkg)).to be == "hello"
+        expect(instance.install_package(pkg)).to eq "hello"
       end
 
       it "uses dnf on amazon-2023" do
@@ -188,7 +188,7 @@ module Beaker
         pkg = 'amazon_package'
         expect(Beaker::Command).to receive(:new).with("dnf -y  install #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
         expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
-        expect(instance.install_package(pkg)).to be == "hello"
+        expect(instance.install_package(pkg)).to eq "hello"
       end
 
       it "uses pacman on archlinux" do
@@ -196,7 +196,7 @@ module Beaker
         pkg = 'archlinux_package'
         expect(Beaker::Command).to receive(:new).with("pacman -S --noconfirm  #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
         expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
-        expect(instance.install_package(pkg)).to be == "hello"
+        expect(instance.install_package(pkg)).to eq "hello"
       end
     end
 
@@ -206,7 +206,7 @@ module Beaker
           @opts = { 'platform' => platform }
           expect(Beaker::Command).to receive(:new).with("apt-get purge  -y pkg", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
           expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
-          expect(instance.uninstall_package('pkg')).to be == "hello"
+          expect(instance.uninstall_package('pkg')).to eq "hello"
         end
 
         it "uses dnf on fedora" do
@@ -214,7 +214,7 @@ module Beaker
           pkg = 'fedora_package'
           expect(Beaker::Command).to receive(:new).with("dnf -y  remove #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
           expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
-          expect(instance.uninstall_package(pkg)).to be == "hello"
+          expect(instance.uninstall_package(pkg)).to eq "hello"
         end
       end
     end
@@ -225,7 +225,7 @@ module Beaker
           @opts = { 'platform' => platform }
           expect(Beaker::Command).to receive(:new).with("apt-get install -o Dpkg::Options::='--force-confold'  -y --force-yes pkg", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
           expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
-          expect(instance.upgrade_package('pkg')).to be == "hello"
+          expect(instance.upgrade_package('pkg')).to eq "hello"
         end
       end
     end
@@ -236,7 +236,7 @@ module Beaker
         pkg = 'redhat_package'
         expect(Beaker::Command).to receive(:new).with("rpm  -Uvh #{pkg} ", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
         expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
-        expect(instance.install_package_with_rpm(pkg)).to be == "hello"
+        expect(instance.install_package_with_rpm(pkg)).to eq "hello"
       end
 
       it "accepts a package and additional options" do
@@ -245,7 +245,7 @@ module Beaker
         cmdline_args = '--foo'
         expect(Beaker::Command).to receive(:new).with("rpm #{cmdline_args} -Uvh #{pkg} ", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
         expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
-        expect(instance.install_package_with_rpm(pkg, cmdline_args)).to be == "hello"
+        expect(instance.install_package_with_rpm(pkg, cmdline_args)).to eq "hello"
       end
     end
 
@@ -255,7 +255,7 @@ module Beaker
        'https://myproxy.com:3128',
        'http://myproxy.com:3128',].each do |url|
         it "correctly extracts rpm proxy options for #{url}" do
-          expect(instance.extract_rpm_proxy_options(url)).to be == '--httpproxy myproxy.com --httpport 3128'
+          expect(instance.extract_rpm_proxy_options(url)).to eq '--httpproxy myproxy.com --httpport 3128'
         end
       end
 

data/spec/beaker/host_spec.rb

@@ -256,7 +256,7 @@ module Beaker
         allow(host).to receive(:exec).and_return(result)
 
         expect(Beaker::Command).to receive(:new).with("mkdir -p \"test/test/test\"")
-        expect(host.mkdir_p('test/test/test')).to be == true
+        expect(host.mkdir_p('test/test/test')).to eq true
       end
 
       it "does the right thing on a bash host, identified as is_cygwin=nil" do
@@ -267,7 +267,7 @@ module Beaker
         allow(host).to receive(:exec).and_return(result)
 
         expect(Beaker::Command).to receive(:new).with("mkdir -p \"test/test/test\"")
-        expect(host.mkdir_p('test/test/test')).to be == true
+        expect(host.mkdir_p('test/test/test')).to eq true
       end
 
       it "does the right thing on a non-bash host, identified as is_cygwin=false (powershell)" do
@@ -284,26 +284,26 @@ module Beaker
                                    "-NoProfile",
                                    "-NonInteractive",
                                    "-Command New-Item -Path 'test\\test\\test' -ItemType 'directory'",])
-        expect(host.mkdir_p('test/test/test')).to be == true
+        expect(host.mkdir_p('test/test/test')).to eq true
       end
     end
 
     describe "#touch" do
       it "generates the right absolute command for a windows host" do
         @platform = 'windows'
-        expect(host.touch('touched_file')).to be == "c:\\\\windows\\\\system32\\\\cmd.exe /c echo. 2> touched_file"
+        expect(host.touch('touched_file')).to eq "c:\\\\windows\\\\system32\\\\cmd.exe /c echo. 2> touched_file"
       end
 
       %w[centos redhat].each do |platform|
         it "generates the right absolute command for a #{platform} host" do
           @platform = platform
-          expect(host.touch('touched_file')).to be == "/bin/touch touched_file"
+          expect(host.touch('touched_file')).to eq "/bin/touch touched_file"
         end
       end
 
       it "generates the right absolute command for an osx host" do
         @platform = 'osx'
-        expect(host.touch('touched_file')).to be == "/usr/bin/touch touched_file"
+        expect(host.touch('touched_file')).to eq "/usr/bin/touch touched_file"
       end
     end
 

data/spec/beaker/logger_spec.rb

@@ -205,11 +205,11 @@ module Beaker
           let(:logger) { described_class.new(my_io, :quiet => true, :log_colors => log_colors) }
 
           it 'overrides the specified log colors' do
-            expect(logger.log_colors[:error]).to be == Beaker::Logger::BLACK
+            expect(logger.log_colors[:error]).to eq Beaker::Logger::BLACK
           end
 
           it 'leaves other colors as the default' do
-            expect(logger.log_colors[:warn]).to be == Beaker::Logger::BRIGHT_RED
+            expect(logger.log_colors[:warn]).to eq Beaker::Logger::BRIGHT_RED
           end
         end
 
@@ -220,11 +220,11 @@ module Beaker
 
           context 'when using the default log colors' do
             it 'overrides notify with NORMAL' do
-              expect(logger.log_colors[:notify]).to be == Beaker::Logger::NORMAL
+              expect(logger.log_colors[:notify]).to eq Beaker::Logger::NORMAL
             end
 
             it 'overrides info with NORMAL' do
-              expect(logger.log_colors[:info]).to be == Beaker::Logger::NORMAL
+              expect(logger.log_colors[:info]).to eq Beaker::Logger::NORMAL
             end
           end
 
@@ -238,15 +238,15 @@ module Beaker
             let(:logger) { described_class.new(my_io, :quiet => true, :log_colors => log_colors) }
 
             it 'overrides the specified log colors' do
-              expect(logger.log_colors[:error]).to be == Beaker::Logger::BLACK
+              expect(logger.log_colors[:error]).to eq Beaker::Logger::BLACK
             end
 
             it 'does not override notify with NORMAL' do
-              expect(logger.log_colors[:notify]).not_to be == Beaker::Logger::NORMAL
+              expect(logger.log_colors[:notify]).not_to eq Beaker::Logger::NORMAL
             end
 
             it 'does not override info with NORMAL' do
-              expect(logger.log_colors[:notify]).not_to be == Beaker::Logger::NORMAL
+              expect(logger.log_colors[:notify]).not_to eq Beaker::Logger::NORMAL
             end
           end
         end

data/spec/beaker/options/hosts_file_parser_spec.rb

@@ -66,7 +66,7 @@ module Beaker
       end
 
       describe '#parse_hosts_string' do
-        it 'will return a #new_host_options hash if given no arguments' do
+        it 'returns a #new_host_options hash if given no arguments' do
           host_options = parser.parse_hosts_string
           expect(host_options).to be === parser.new_host_options
         end

data/spec/beaker/options/parser_spec.rb

@@ -127,10 +127,10 @@ module Beaker
           my_args = ['--log-level', 'debug', '-h', hosts_path]
 
           expect(parser.parse_args(my_args)[:command_line]).to include(my_args.join(' '))
-          expect(parser.attribution[:command_line]).to be == 'cmd'
-          expect(parser.attribution[:hosts_file]).to be == 'cmd'
-          expect(parser.attribution[:log_level]).to be == 'cmd'
-          expect(parser.attribution[:pe_dir]).to be == 'preset'
+          expect(parser.attribution[:command_line]).to eq 'cmd'
+          expect(parser.attribution[:hosts_file]).to eq 'cmd'
+          expect(parser.attribution[:log_level]).to eq 'cmd'
+          expect(parser.attribution[:pe_dir]).to eq 'preset'
         end
 
         describe 'does prioritization correctly' do
@@ -205,8 +205,8 @@ module Beaker
 
             opts = parser.parse_args([])
             attribution = parser.attribution
-            expect(opts[:level]).to be == 'lowest'
-            expect(attribution[:level]).to be == 'preset'
+            expect(opts[:level]).to eq 'lowest'
+            expect(attribution[:level]).to eq 'preset'
           end
 
           it 'project options should have seventh priority' do
@@ -215,10 +215,10 @@ module Beaker
 
             opts = parser.parse_args([])
             attribution = parser.attribution
-            expect(opts[:ssh][:auth_methods]).to be == 'auth_project_123'
-            expect(attribution[:ssh][:auth_methods]).to be == 'project'
-            expect(opts[:level]).to be == 'seventh'
-            expect(attribution[:level]).to be == 'project'
+            expect(opts[:ssh][:auth_methods]).to eq 'auth_project_123'
+            expect(attribution[:ssh][:auth_methods]).to eq 'project'
+            expect(opts[:level]).to eq 'seventh'
+            expect(attribution[:level]).to eq 'project'
           end
 
           it 'home directory options should have sixth priority' do
@@ -227,10 +227,10 @@ module Beaker
 
             opts = parser.parse_args([])
             attribution = parser.attribution
-            expect(opts[:ssh][:auth_methods]).to be == 'auth_home_123'
-            expect(attribution[:ssh][:auth_methods]).to be == 'homedir'
-            expect(opts[:level]).to be == 'sixth'
-            expect(attribution[:level]).to be == 'homedir'
+            expect(opts[:ssh][:auth_methods]).to eq 'auth_home_123'
+            expect(attribution[:ssh][:auth_methods]).to eq 'homedir'
+            expect(opts[:level]).to eq 'sixth'
+            expect(attribution[:level]).to eq 'homedir'
           end
 
           it 'subcommand_options should have fifth priority' do
@@ -239,8 +239,8 @@ module Beaker
 
             opts = parser.parse_args([])
             attribution = parser.attribution
-            expect(opts[:level]).to be == 'fifth'
-            expect(attribution[:level]).to be == 'subcommand'
+            expect(opts[:level]).to eq 'fifth'
+            expect(attribution[:level]).to eq 'subcommand'
           end
 
           it 'options file has fourth priority' do
@@ -250,16 +250,16 @@ module Beaker
             opts = parser.parse_args([])
             attribution = parser.attribution
             expect(attribution[:ssh]).to be_a(Hash)
-            expect(attribution[:ssh][:auth_methods]).to be == 'options_file'
-            expect(attribution[:ssh][:user_known_hosts_file]).to be == 'options_file'
-            expect(attribution[:ssh][:config]).to be == 'preset'
-            expect(attribution[:ssh][:verify_host_key]).to be == 'preset'
-            expect(attribution[:ssh][:port]).to be == 'preset'
-            expect(attribution[:ssh][:forward_agent]).to be == 'preset'
-            expect(attribution[:ssh][:keys]).to be == 'preset'
-            expect(attribution[:ssh][:keepalive]).to be == 'preset'
-            expect(opts[:level]).to be == 'fourth'
-            expect(attribution[:level]).to be == 'options_file'
+            expect(attribution[:ssh][:auth_methods]).to eq 'options_file'
+            expect(attribution[:ssh][:user_known_hosts_file]).to eq 'options_file'
+            expect(attribution[:ssh][:config]).to eq 'preset'
+            expect(attribution[:ssh][:verify_host_key]).to eq 'preset'
+            expect(attribution[:ssh][:port]).to eq 'preset'
+            expect(attribution[:ssh][:forward_agent]).to eq 'preset'
+            expect(attribution[:ssh][:keys]).to eq 'preset'
+            expect(attribution[:ssh][:keepalive]).to eq 'preset'
+            expect(opts[:level]).to eq 'fourth'
+            expect(attribution[:level]).to eq 'options_file'
           end
 
           it 'host file CONFIG section has third priority' do
@@ -268,8 +268,8 @@ module Beaker
 
             opts = parser.parse_args([])
             attribution = parser.attribution
-            expect(opts[:level]).to be == 'third'
-            expect(attribution[:level]).to be == 'host_file'
+            expect(opts[:level]).to eq 'third'
+            expect(attribution[:level]).to eq 'host_file'
           end
 
           it 'command line arguments have second priority' do
@@ -278,8 +278,8 @@ module Beaker
 
             opts = parser.parse_args([])
             attribution = parser.attribution
-            expect(opts[:level]).to be == 'second'
-            expect(attribution[:level]).to be == 'cmd'
+            expect(opts[:level]).to eq 'second'
+            expect(attribution[:level]).to eq 'cmd'
           end
 
           it 'env vars have highest priority' do
@@ -287,8 +287,8 @@ module Beaker
 
             opts = parser.parse_args([])
             attribution = parser.attribution
-            expect(opts[:level]).to be == 'highest'
-            expect(attribution[:level]).to be == 'env'
+            expect(opts[:level]).to eq 'highest'
+            expect(attribution[:level]).to eq 'env'
           end
 
           it "loads the options file from a project file" do
@@ -325,12 +325,12 @@ module Beaker
           args   = ["-h", hosts_path, "--log-level", log_level, "--type", type, "--install", "PUPPET/1.0,HIERA/hello"]
           output = parser.parse_args(args)
           attribution = parser.attribution
-          expect(output[:hosts_file]).to be == hosts_path
-          expect(attribution[:hosts_file]).to be == 'cmd'
-          expect(output[:jenkins_build_url]).to be == build_url
-          expect(attribution[:jenkins_build_url]).to be == 'env'
+          expect(output[:hosts_file]).to eq hosts_path
+          expect(attribution[:hosts_file]).to eq 'cmd'
+          expect(output[:jenkins_build_url]).to eq build_url
+          expect(attribution[:jenkins_build_url]).to eq 'env'
           expect(output[:install]).to include('git://github.com/puppetlabs/hiera.git#hello')
-          expect(attribution[:install]).to be == 'runtime'
+          expect(attribution[:install]).to eq 'runtime'
 
           ENV["BUILD_URL"] = old_build_url
         end
@@ -567,20 +567,20 @@ module Beaker
             hosts['HOSTS'][:master][:ssh] = { :user => 'hello' }
             parser.instance_variable_set(:@options, hosts)
             parser.normalize_args
-            expect(hosts['HOSTS'][:master][:user]).to be == 'hello'
+            expect(hosts['HOSTS'][:master][:user]).to eq 'hello'
           end
 
           it 'uses default user if there is an ssh hash, but no ssh[:user]' do
             hosts['HOSTS'][:master][:ssh] = { :hello => 'hello' }
             parser.instance_variable_set(:@options, hosts)
             parser.normalize_args
-            expect(hosts['HOSTS'][:master][:user]).to be == 'root'
+            expect(hosts['HOSTS'][:master][:user]).to eq 'root'
           end
 
           it 'uses default user if no ssh hash' do
             parser.instance_variable_set(:@options, hosts)
             parser.normalize_args
-            expect(hosts['HOSTS'][:master][:user]).to be == 'root'
+            expect(hosts['HOSTS'][:master][:user]).to eq 'root'
           end
         end
       end

data/spec/beaker/platform_spec.rb

@@ -88,6 +88,11 @@ module Beaker
         expect(platform.with_version_codename).to be === 'debian-squeeze-xxx'
       end
 
+      it "can convert ubuntu-2404-xxx to ubuntu-noble-xxx" do
+        @name = 'ubuntu-2404-xxx'
+        expect(platform.with_version_codename).to be === 'ubuntu-noble-xxx'
+      end
+
       it "can convert ubuntu-2204-xxx to ubuntu-jammy-xxx" do
         @name = 'ubuntu-2204-xxx'
         expect(platform.with_version_codename).to be === 'ubuntu-jammy-xxx'

data/spec/beaker/shared/host_manager_spec.rb

@@ -140,7 +140,7 @@ module Beaker
           end
         end
 
-        it "will ignore run_in_parallel global option" do
+        it "ignores run_in_parallel global option" do
           myhosts = host_handler.run_block_on(hosts, nil, { :run_in_parallel => [] }) do |host|
             host
           end

data/spec/beaker/shared/semvar_spec.rb

@@ -57,7 +57,7 @@ module Beaker
         end
 
         it 'reports that 2015.3.0 is not less than 2015.3.0' do
-          expect(subject.version_is_less('2015.3.0', '2015.3.0')).to be == false
+          expect(subject.version_is_less('2015.3.0', '2015.3.0')).to eq false
         end
       end
 

data/spec/beaker/subcommand/subcommand_util_spec.rb

@@ -57,23 +57,23 @@ module Beaker
 
       describe 'execute_subcommand' do
         it "determines if we should execute the init subcommand" do
-          expect(subject.execute_subcommand?("init")).to be == true
+          expect(subject.execute_subcommand?("init")).to eq true
         end
 
         it "does not attempt to execute intialize as a subcommand" do
-          expect(subject.execute_subcommand?("initialize")).to be == false
+          expect(subject.execute_subcommand?("initialize")).to eq false
         end
 
         it "determines if we should execute the help subcommand" do
-          expect(subject.execute_subcommand?("help")).to be == true
+          expect(subject.execute_subcommand?("help")).to eq true
         end
 
         it "determines if we should execute the provision subcommand" do
-          expect(subject.execute_subcommand?("provision")).to be == true
+          expect(subject.execute_subcommand?("provision")).to eq true
         end
 
         it "determines that a subcommand should not be executed" do
-          expect(subject.execute_subcommand?("notasubcommand")).to be == false
+          expect(subject.execute_subcommand?("notasubcommand")).to eq false
         end
       end