chef 12.0.3 → 12.1.0.rc.0

data/spec/integration/knife/chef_fs_data_store_spec.rb

@@ -138,6 +138,7 @@ EOM
     context 'PUT /TYPE/NAME' do
       before do
         file 'empty.json', {}
+        file 'dummynode.json', { "name" => "x", "chef_environment" => "rspec" , "json_class" => "Chef::Node", "normal" => {"foo" => "bar"}}
         file 'rolestuff.json', '{"description":"hi there","name":"x"}'
         file 'cookbooks_to_upload/x/metadata.rb', cookbook_x_100_metadata_rb
       end
@@ -165,9 +166,10 @@ EOM
         knife('list --local /environments').should_succeed "/environments/x.json\n"
       end
 
-      it 'knife raw -z -i empty.json -m PUT /nodes/x' do
-        knife("raw -z -i #{path_to('empty.json')} -m PUT /nodes/x").should_succeed( /"x"/ )
+      it 'knife raw -z -i dummynode.json -m PUT /nodes/x' do
+        knife("raw -z -i #{path_to('dummynode.json')} -m PUT /nodes/x").should_succeed( /"x"/ )
         knife('list --local /nodes').should_succeed "/nodes/x.json\n"
+        knife('show -z /nodes/x.json --verbose').should_succeed /"bar"/
       end
 
       it 'knife raw -z -i empty.json -m PUT /roles/x' do
@@ -180,9 +182,9 @@ EOM
         knife('list --local /users').should_succeed "/users/x.json\n"
       end
 
-      it 'After knife raw -z -i rolestuff.json -m PUT /roles/x, the output is pretty', :pending => (RUBY_VERSION < "1.9") do
+      it 'After knife raw -z -i rolestuff.json -m PUT /roles/x, the output is pretty', :skip => (RUBY_VERSION < "1.9") do
         knife("raw -z -i #{path_to('rolestuff.json')} -m PUT /roles/x").should_succeed( /"x"/ )
-        IO.read(path_to('roles/x.json')).should == <<EOM.strip
+        expect(IO.read(path_to('roles/x.json'))).to eq <<EOM.strip
 {
   "name": "x",
   "description": "hi there"
@@ -196,6 +198,7 @@ EOM
     context 'POST /TYPE/NAME' do
       before do
         file 'empty.json', { 'name' => 'z' }
+        file 'dummynode.json', { "name" => "z", "chef_environment" => "rspec" , "json_class" => "Chef::Node", "normal" => {"foo" => "bar"}}
         file 'empty_x.json', { 'name' => 'x' }
         file 'empty_id.json', { 'id' => 'z' }
         file 'rolestuff.json', '{"description":"hi there","name":"x"}'
@@ -231,9 +234,10 @@ EOM
         knife('list --local /environments').should_succeed "/environments/z.json\n"
       end
 
-      it 'knife raw -z -i empty.json -m POST /nodes' do
-        knife("raw -z -i #{path_to('empty.json')} -m POST /nodes").should_succeed( /uri/ )
+      it 'knife raw -z -i dummynode.json -m POST /nodes' do
+        knife("raw -z -i #{path_to('dummynode.json')} -m POST /nodes").should_succeed( /uri/ )
         knife('list --local /nodes').should_succeed "/nodes/z.json\n"
+        knife('show -z /nodes/z.json').should_succeed /"bar"/
       end
 
       it 'knife raw -z -i empty.json -m POST /roles' do
@@ -246,9 +250,9 @@ EOM
         knife('list --local /users').should_succeed "/users/z.json\n"
       end
 
-      it 'After knife raw -z -i rolestuff.json -m POST /roles, the output is pretty', :pending => (RUBY_VERSION < "1.9") do
+      it 'After knife raw -z -i rolestuff.json -m POST /roles, the output is pretty', :skip => (RUBY_VERSION < "1.9") do
         knife("raw -z -i #{path_to('rolestuff.json')} -m POST /roles").should_succeed( /uri/ )
-        IO.read(path_to('roles/x.json')).should == <<EOM.strip
+        expect(IO.read(path_to('roles/x.json'))).to eq <<EOM.strip
 {
   "name": "x",
   "description": "hi there"

data/spec/integration/knife/common_options_spec.rb

@@ -39,7 +39,7 @@ describe 'knife common options', :workstation do
 
         it 'knife raw /nodes/x should retrieve the node' do
           knife('raw /nodes/x').should_succeed( /"name": "x"/ )
-          Chef::Config.chef_server_url.should == 'http://localhost:9999'
+          expect(Chef::Config.chef_server_url).to eq('http://localhost:9999')
         end
       end
 
@@ -101,7 +101,7 @@ EOM
 
     it 'knife raw -z --chef-zero-port=9999 /nodes/x retrieves the node' do
       knife('raw -z --chef-zero-port=9999 /nodes/x').should_succeed( /"name": "x"/ )
-      Chef::Config.chef_server_url.should == 'http://localhost:9999'
+      expect(Chef::Config.chef_server_url).to eq('http://localhost:9999')
     end
 
     context 'when the default port (8889) is already bound' do
@@ -149,7 +149,7 @@ EOM
 
     it 'knife raw -z --chef-zero-port=9999 /nodes/x retrieves the node' do
       knife('raw -z --chef-zero-port=9999 /nodes/x').should_succeed( /"name": "x"/ )
-      Chef::Config.chef_server_url.should == 'http://localhost:9999'
+      expect(Chef::Config.chef_server_url).to eq('http://localhost:9999')
     end
   end
 end

data/spec/integration/knife/cookbook_api_ipv6_spec.rb

@@ -92,7 +92,7 @@ END_CLIENT_RB
           shell_out!("#{knife} cookbook upload apache2 #{knife_config_flag}", :cwd => chef_dir)
           versions_list_json = Chef::HTTP::Simple.new("http://[::1]:8900").get("/cookbooks/apache2", "accept" => "application/json")
           versions_list = Chef::JSONCompat.from_json(versions_list_json)
-          versions_list["apache2"]["versions"].should_not be_empty
+          expect(versions_list["apache2"]["versions"]).not_to be_empty
         end
 
         context "and the cookbook has been uploaded to the server" do
@@ -102,7 +102,7 @@ END_CLIENT_RB
 
           it "downloads the cookbook" do
             shell_out!("knife cookbook download apache2 #{knife_config_flag} -d #{cache_path}", :cwd => chef_dir)
-            Dir["#{cache_path}/*"].map {|entry| File.basename(entry)}.should include("apache2-0.0.1")
+            expect(Dir["#{cache_path}/*"].map {|entry| File.basename(entry)}).to include("apache2-0.0.1")
           end
         end
 

data/spec/integration/knife/deps_spec.rb

@@ -251,8 +251,8 @@ EOM
         end
         it 'knife deps --tree prints each once' do
           knife('deps --tree /roles/foo.json /roles/self.json') do
-            stdout.should == "/roles/foo.json\n  /roles/bar.json\n    /roles/baz.json\n      /roles/foo.json\n/roles/self.json\n  /roles/self.json\n"
-            stderr.should == "WARNING: No knife configuration file found\n"
+            expect(stdout).to eq("/roles/foo.json\n  /roles/bar.json\n    /roles/baz.json\n      /roles/foo.json\n/roles/self.json\n  /roles/self.json\n")
+            expect(stderr).to eq("WARNING: No knife configuration file found\n")
           end
         end
       end
@@ -589,8 +589,8 @@ EOM
         end
         it 'knife deps --tree prints each once' do
           knife('deps --remote --tree /roles/foo.json /roles/self.json') do
-            stdout.should == "/roles/foo.json\n  /roles/bar.json\n    /roles/baz.json\n      /roles/foo.json\n/roles/self.json\n  /roles/self.json\n"
-            stderr.should == "WARNING: No knife configuration file found\n"
+            expect(stdout).to eq("/roles/foo.json\n  /roles/bar.json\n    /roles/baz.json\n      /roles/foo.json\n/roles/self.json\n  /roles/self.json\n")
+            expect(stderr).to eq("WARNING: No knife configuration file found\n")
           end
         end
       end

data/spec/integration/knife/diff_spec.rb

@@ -247,7 +247,7 @@ EOM
         end
         when_the_chef_server 'has an environment with a different value' do
           before { environment 'x', { 'description' => 'hi' } }
-          it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do
+          it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do
             knife('diff /environments/x.json').should_succeed(/
  {
 -  "name": "x",
@@ -277,7 +277,7 @@ EOM
             environment 'x', {}
           end
 
-          it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do
+          it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do
             knife('diff /environments/x.json').should_succeed(/
  {
 -  "name": "x"
@@ -291,7 +291,7 @@ EOM
           before do
             environment 'x', { 'description' => 'lo' }
           end
-          it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do
+          it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do
             knife('diff /environments/x.json').should_succeed(/
  {
    "name": "x",
@@ -533,7 +533,7 @@ EOM
         end
         when_the_chef_server 'has an environment with a different value' do
           before { environment 'x', { 'description' => 'hi' } }
-          it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do
+          it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do
             knife('diff /environments/x.json').should_succeed(/
  {
 -  "name": "x",
@@ -560,7 +560,7 @@ EOM
         end
         when_the_chef_server 'has an environment with no value' do
           before { environment 'x', {} }
-          it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do
+          it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do
             knife('diff /environments/x.json').should_succeed(/
  {
 -  "name": "x"
@@ -574,7 +574,7 @@ EOM
           before do
             environment 'x', { 'description' => 'lo' }
           end
-          it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do
+          it 'knife diff reports the difference', :skip => (RUBY_VERSION < "1.9") do
             knife('diff /environments/x.json').should_succeed(/
  {
    "name": "x",

data/spec/integration/knife/download_spec.rb

@@ -1069,19 +1069,19 @@ EOM
     end
 
     when_the_repository 'is empty' do
-      it 'knife download /cookbooks/x signs all requests', :ruby_gte_19_only do
+      it 'knife download /cookbooks/x signs all requests' do
 
         # Check that BasicClient.request() always gets called with X-OPS-USERID
         original_new = Chef::HTTP::BasicClient.method(:new)
-        Chef::HTTP::BasicClient.should_receive(:new) do |args|
+        expect(Chef::HTTP::BasicClient).to receive(:new) { |args|
           new_result = original_new.call(*args)
           original_request = new_result.method(:request)
-          new_result.should_receive(:request) do |method, url, body, headers, &response_handler|
-            headers['X-OPS-USERID'].should_not be_nil
+          expect(new_result).to receive(:request) { |method, url, body, headers, &response_handler|
+            expect(headers['X-OPS-USERID']).not_to be_nil
             original_request.call(method, url, body, headers, &response_handler)
-          end.at_least(:once)
+          }.at_least(:once)
           new_result
-        end.at_least(:once)
+        }.at_least(:once)
 
         knife('download /cookbooks/x').should_succeed <<EOM
 Created /cookbooks

data/spec/integration/knife/list_spec.rb

@@ -471,7 +471,7 @@ EOM
         end
       end
 
-      when_the_repository 'has a cookbooks directory and a symlinked cookbooks directory', :pending => (Chef::Platform.windows?) do
+      when_the_repository 'has a cookbooks directory and a symlinked cookbooks directory', :skip => (Chef::Platform.windows?) do
         before do
           directory 'cookbooks'
           symlink 'symlinked', 'cookbooks'
@@ -508,7 +508,7 @@ EOM
         end
       end
 
-      when_the_repository 'has a real_cookbooks directory and a cookbooks symlink to it', :pending => (Chef::Platform.windows?) do
+      when_the_repository 'has a real_cookbooks directory and a cookbooks symlink to it', :skip => (Chef::Platform.windows?) do
         before do
           directory 'real_cookbooks'
           symlink 'cookbooks', 'real_cookbooks'

data/spec/integration/knife/raw_spec.rb

@@ -38,7 +38,7 @@ describe 'knife raw', :workstation do
       user 'x', '{}'
     end
 
-    it 'knife raw /nodes/x returns the node', :pending => (RUBY_VERSION < "1.9") do
+    it 'knife raw /nodes/x returns the node', :skip => (RUBY_VERSION < "1.9") do
       knife('raw /nodes/x').should_succeed <<EOM
 {
   "name": "x",
@@ -68,7 +68,7 @@ EOM
       knife('raw /blarghle').should_fail(/ERROR: Server responded with error 404 "Not Found\s*"/)
     end
 
-    it 'knife raw -m DELETE /roles/x succeeds', :pending => (RUBY_VERSION < "1.9") do
+    it 'knife raw -m DELETE /roles/x succeeds', :skip => (RUBY_VERSION < "1.9") do
       knife('raw -m DELETE /roles/x').should_succeed <<EOM
 {
   "name": "x",
@@ -92,7 +92,7 @@ EOM
       knife('show /roles/x.json').should_fail "ERROR: /roles/x.json: No such file or directory\n"
     end
 
-    it 'knife raw -m PUT -i blah.txt /roles/x succeeds', :pending => (RUBY_VERSION < "1.9") do
+    it 'knife raw -m PUT -i blah.txt /roles/x succeeds', :skip => (RUBY_VERSION < "1.9") do
       Tempfile.open('raw_put_input') do |file|
         file.write <<EOM
 {
@@ -146,7 +146,7 @@ EOM
       end
     end
 
-    it 'knife raw -m POST -i blah.txt /roles succeeds', :pending => (RUBY_VERSION < "1.9") do
+    it 'knife raw -m POST -i blah.txt /roles succeeds', :skip => (RUBY_VERSION < "1.9") do
       Tempfile.open('raw_put_input') do |file|
         file.write <<EOM
 {
@@ -196,7 +196,7 @@ EOM
         @raw_server_thread.kill if @raw_server_thread
       end
 
-      it 'knife raw /blah returns the prettified json', :pending => (RUBY_VERSION < "1.9") do
+      it 'knife raw /blah returns the prettified json', :skip => (RUBY_VERSION < "1.9") do
         knife('raw /blah').should_succeed <<EOM
 {
   "x": "y",

data/spec/integration/knife/serve_spec.rb

@@ -31,18 +31,18 @@ describe 'knife serve', :workstation do
       exception = nil
       t = Thread.new do
         begin
-          knife('serve --chef-zero-port=8889')
+          knife('serve --chef-zero-port=8890')
         rescue
           exception = $!
         end
       end
       begin
         Chef::Config.log_level = :debug
-        Chef::Config.chef_server_url = 'http://localhost:8889'
+        Chef::Config.chef_server_url = 'http://localhost:8890'
         Chef::Config.node_name = nil
         Chef::Config.client_key = nil
         api = Chef::ServerAPI.new
-        api.get('nodes/x')['name'].should == 'x'
+        expect(api.get('nodes/x')['name']).to eq('x')
       rescue
         if exception
           raise exception

data/spec/integration/knife/show_spec.rb

@@ -76,7 +76,7 @@ EOM
 }
 EOM
       end
-      it 'knife show /environments/x.json shows the remote version', :pending => (RUBY_VERSION < "1.9") do
+      it 'knife show /environments/x.json shows the remote version', :skip => (RUBY_VERSION < "1.9") do
         knife('show /environments/x.json').should_succeed <<EOM
 /environments/x.json:
 {
@@ -92,7 +92,7 @@ EOM
 }
 EOM
       end
-      it 'knife show /roles/x.json shows the remote version', :pending => (RUBY_VERSION < "1.9") do
+      it 'knife show /roles/x.json shows the remote version', :skip => (RUBY_VERSION < "1.9") do
         knife('show /roles/x.json').should_succeed <<EOM
 /roles/x.json:
 {
@@ -135,7 +135,7 @@ EOM
         'name' => 'x'
       }
     end
-    it 'knife show shows the attributes in a predetermined order', :pending => (RUBY_VERSION < "1.9") do
+    it 'knife show shows the attributes in a predetermined order', :skip => (RUBY_VERSION < "1.9") do
       knife('show /environments/x.json').should_succeed <<EOM
 /environments/x.json:
 {

data/spec/integration/knife/upload_spec.rb

@@ -262,7 +262,7 @@ Created /data_bags/x/y.json
 EOM
           knife('diff --name-status /data_bags').should_succeed <<EOM
 EOM
-          Chef::JSONCompat.parse(knife('raw /data/x/y').stdout, :create_additions => false).keys.sort.should == [ 'foo', 'id' ]
+          expect(Chef::JSONCompat.parse(knife('raw /data/x/y').stdout, :create_additions => false).keys.sort).to eq([ 'foo', 'id' ])
         end
 
         it 'knife upload /data_bags/x /data_bags/x/y.json uploads x once' do
@@ -286,9 +286,9 @@ Created /data_bags/x/y.json
 EOM
           knife('diff --name-status /data_bags').should_succeed ''
           result = Chef::JSONCompat.parse(knife('raw /data/x/y').stdout, :create_additions => false)
-          result.keys.sort.should == [ 'chef_type', 'data_bag', 'id' ]
-          result['chef_type'].should == 'aaa'
-          result['data_bag'].should == 'bbb'
+          expect(result.keys.sort).to eq([ 'chef_type', 'data_bag', 'id' ])
+          expect(result['chef_type']).to eq('aaa')
+          expect(result['data_bag']).to eq('bbb')
         end
       end
 
@@ -1268,8 +1268,8 @@ Created /nodes/x.json
 Updated /org.json
 Created /roles/x.json
 EOM
-          api.get('association_requests').map { |a| a['username'] }.should == [ 'foo' ]
-          api.get('users').map { |a| a['user']['username'] }.should == [ 'bar' ]
+          expect(api.get('association_requests').map { |a| a['username'] }).to eq([ 'foo' ])
+          expect(api.get('users').map { |a| a['user']['username'] }).to eq([ 'bar' ])
         end
       end
 
@@ -1280,7 +1280,7 @@ EOM
 
         it 'knife upload / emits a warning for bar and adds foo and foobar' do
           knife('upload /').should_succeed ''
-          api.get('/')['full_name'].should == 'Something'
+          expect(api.get('/')['full_name']).to eq('Something')
         end
       end
 
@@ -1291,7 +1291,7 @@ EOM
 
         it 'knife upload / emits a warning for bar and adds foo and foobar' do
           knife('upload /').should_succeed "Updated /org.json\n"
-          api.get('/')['full_name'].should == 'Something Else'
+          expect(api.get('/')['full_name']).to eq('Something Else')
         end
       end
 
@@ -1306,8 +1306,8 @@ EOM
 
           it 'knife upload / emits a warning for bar and invites foobar' do
             knife('upload /').should_succeed "Updated /invitations.json\n", :stderr => "WARN: Could not invite bar to organization foo: User bar is already in organization foo\n"
-            api.get('association_requests').map { |a| a['username'] }.should == [ 'foo', 'foobar' ]
-            api.get('users').map { |a| a['user']['username'] }.should == [ 'bar' ]
+            expect(api.get('association_requests').map { |a| a['username'] }).to eq([ 'foo', 'foobar' ])
+            expect(api.get('users').map { |a| a['user']['username'] }).to eq([ 'bar' ])
           end
         end
 
@@ -1318,8 +1318,8 @@ EOM
 
           it 'knife upload / emits a warning for bar and adds foo and foobar' do
             knife('upload /').should_succeed "Updated /members.json\n"
-            api.get('association_requests').map { |a| a['username'] }.should == [ ]
-            api.get('users').map { |a| a['user']['username'] }.should == [ 'bar', 'foo', 'foobar' ]
+            expect(api.get('association_requests').map { |a| a['username'] }).to eq([ ])
+            expect(api.get('users').map { |a| a['user']['username'] }).to eq([ 'bar', 'foo', 'foobar' ])
           end
         end
 
@@ -1331,8 +1331,8 @@ EOM
 
           it 'knife upload / does nothing' do
             knife('upload /').should_succeed ''
-            api.get('association_requests').map { |a| a['username'] }.should == [ 'foo' ]
-            api.get('users').map { |a| a['user']['username'] }.should == [ 'bar' ]
+            expect(api.get('association_requests').map { |a| a['username'] }).to eq([ 'foo' ])
+            expect(api.get('users').map { |a| a['user']['username'] }).to eq([ 'bar' ])
           end
         end
       end
@@ -1347,8 +1347,8 @@ EOM
 
           it 'knife upload / does nothing' do
             knife('upload /').should_succeed ''
-            api.get('association_requests').map { |a| a['username'] }.should == [ 'bar', 'foo' ]
-            api.get('users').map { |a| a['user']['username'] }.should == [ ]
+            expect(api.get('association_requests').map { |a| a['username'] }).to eq([ 'bar', 'foo' ])
+            expect(api.get('users').map { |a| a['user']['username'] }).to eq([ ])
           end
         end
       end
@@ -1363,8 +1363,8 @@ EOM
 
           it 'knife upload / does nothing' do
             knife('upload /').should_succeed ''
-            api.get('association_requests').map { |a| a['username'] }.should == [ ]
-            api.get('users').map { |a| a['user']['username'] }.should == [ 'bar', 'foo' ]
+            expect(api.get('association_requests').map { |a| a['username'] }).to eq([ ])
+            expect(api.get('users').map { |a| a['user']['username'] }).to eq([ 'bar', 'foo' ])
           end
         end
       end

data/spec/integration/recipes/lwrp_inline_resources_spec.rb

@@ -71,7 +71,7 @@ EOM
      (up to date)
 EOM
       expected = expected.lines.map { |l| l.chomp }.join("\n")
-      actual.should include(expected)
+      expect(actual).to include(expected)
       result.error!
     end
   end

data/spec/integration/solo/solo_spec.rb

@@ -28,7 +28,7 @@ file_cache_path "#{path_to('config/cache')}"
 EOM
       result = shell_out("ruby bin/chef-solo -c \"#{path_to('config/solo.rb')}\" -o 'x::default' -l debug", :cwd => chef_dir)
       result.error!
-      result.stdout.should include("ITWORKS")
+      expect(result.stdout).to include("ITWORKS")
     end
 
     it "should evaluate its node.json file" do
@@ -43,7 +43,7 @@ E
 
       result = shell_out("ruby bin/chef-solo -c \"#{path_to('config/solo.rb')}\" -j '#{path_to('config/node.json')}' -l debug", :cwd => chef_dir)
       result.error!
-      result.stdout.should include("ITWORKS")
+      expect(result.stdout).to include("ITWORKS")
     end
 
   end
@@ -63,8 +63,8 @@ cookbook_path "#{path_to('cookbooks')}"
 file_cache_path "#{path_to('config/cache')}"
 EOM
       result = shell_out("ruby bin/chef-solo -c \"#{path_to('config/solo.rb')}\" -o 'x::default' -l debug", :cwd => chef_dir)
-      result.exitstatus.should == 0 # For CHEF-5120 this becomes 1
-      result.stdout.should include("WARN: MissingCookbookDependency")
+      expect(result.exitstatus).to eq(0) # For CHEF-5120 this becomes 1
+      expect(result.stdout).to include("WARN: MissingCookbookDependency")
     end
   end
 
@@ -83,15 +83,14 @@ end
 EOM
     end
 
-    # Ruby 1.8.7 doesn't have Process.spawn :(
-    it "while running solo concurrently", :ruby_gte_19_only => true do
+    it "while running solo concurrently" do
       file 'config/solo.rb', <<EOM
 cookbook_path "#{path_to('cookbooks')}"
 file_cache_path "#{path_to('config/cache')}"
 EOM
       # We have a timeout protection here so that if due to some bug
       # run_lock gets stuck we can discover it.
-      lambda {
+      expect {
         Timeout.timeout(120) do
           chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..")
 
@@ -109,7 +108,7 @@ EOM
           Process.waitpid(s1)
           Process.waitpid(s2)
         end
-      }.should_not raise_error
+      }.not_to raise_error
 
       # Unfortunately file / directory helpers in integration tests
       # are implemented using before(:each) so we need to do all below
@@ -117,13 +116,13 @@ EOM
       run_log = File.read(path_to('logs/runs.log'))
 
       # both of the runs should succeed
-      run_log.lines.reject {|l| !l.include? "INFO: Chef Run complete in"}.length.should == 2
+      expect(run_log.lines.reject {|l| !l.include? "INFO: Chef Run complete in"}.length).to eq(2)
 
       # second run should have a message which indicates it's waiting for the first run
       pid_lines = run_log.lines.reject {|l| !l.include? "Chef-client pid:"}
-      pid_lines.length.should == 2
+      expect(pid_lines.length).to eq(2)
       pids = pid_lines.map {|l| l.split(" ").last}
-      run_log.should include("Chef client #{pids[0]} is running, will wait for it to finish and then run.")
+      expect(run_log).to include("Chef client #{pids[0]} is running, will wait for it to finish and then run.")
 
       # second run should start after first run ends
       starts = [ ]
@@ -135,7 +134,7 @@ EOM
           ends << index
         end
       end
-      starts[1].should > ends[0]
+      expect(starts[1]).to be > ends[0]
     end
 
   end