spec/mirror_spec.rb in braid-1.0.16 vs spec/mirror_spec.rb in braid-1.0.17

@@ -1,21 +1,21 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 describe 'Braid::Mirror.new_from_options' do
   it 'should default branch to master' do
     new_from_options('git://path')
-    @mirror.branch.should == 'master'
+    expect(@mirror.branch).to eq('master')
   end
 
   it 'should default mirror to last path part, ignoring trailing .git' do
     new_from_options('http://path.git')
-    @mirror.path.should == 'path'
+    expect(@mirror.path).to eq('path')
   end
 
   it 'should strip trailing slash from specified path' do
     new_from_options('http://path.git', 'path' => 'vendor/tools/mytool/')
-    @mirror.path.should == 'vendor/tools/mytool'
+    expect(@mirror.path).to eq('vendor/tools/mytool')
   end
 end
 
 describe 'Braid::Mirror#diff' do
   before(:each) do
@@ -30,34 +30,34 @@
 
   it 'should return an empty string when the hashes match' do
     set_hashes('b' * 40, 'b' * 40)
     git.expects(:fetch)
     git.expects(:diff_tree).never
-    @mirror.diff.should == ''
+    expect(@mirror.diff).to eq('')
   end
 
   it 'should generate a diff when the hashes do not match' do
     set_hashes('b' * 40, 'c' * 40)
     diff = "diff --git a/path b/path\n"
     git.expects(:fetch)
     git.expects(:diff_tree).with('b' * 40, 'c' * 40).returns(diff)
-    @mirror.diff.should == diff
+    expect(@mirror.diff).to eq(diff)
   end
 end
 
 describe 'Braid::Mirror#base_revision' do
   it 'should be inferred when no revision is set' do
     @mirror = build_mirror
-    @mirror.revision.should be_nil
+    expect(@mirror.revision).to be_nil
     @mirror.expects(:inferred_revision).returns('b' * 40)
-    @mirror.base_revision.should == 'b' * 40
+    expect(@mirror.base_revision).to eq('b' * 40)
   end
 
   it 'should be the parsed hash for git mirrors' do
     @mirror = build_mirror('revision' => 'a' * 7)
     git.expects(:rev_parse).with('a' * 7).returns('a' * 40)
-    @mirror.base_revision.should == 'a' * 40
+    expect(@mirror.base_revision).to eq('a' * 40)
   end
 end
 
 describe 'Braid::Mirror#inferred_revision' do
   it 'should return the last commit before the most recent update' do
@@ -65,24 +65,24 @@
     git.expects(:rev_list).times(2).returns(
         "#{'a' * 40}\n",
         "commit #{'b' * 40}\n#{'t' * 40}\n"
     )
     git.expects(:tree_hash).with(@mirror.path, 'a' * 40).returns('t' * 40)
-    @mirror.send(:inferred_revision).should == 'b' * 40
+    expect(@mirror.send(:inferred_revision)).to eq('b' * 40)
   end
 end
 
 describe 'Braid::Mirror#cached?' do
   before(:each) do
     @mirror = new_from_options('git://path')
   end
 
   it 'should be true when the remote path matches the cache path' do
     git.expects(:remote_url).with(@mirror.remote).returns(git_cache.path(@mirror.url))
-    @mirror.should be_cached
+    expect(@mirror).to be_cached
   end
 
   it 'should be false if the remote does not point to the cache' do
     git.expects(:remote_url).with(@mirror.remote).returns(@mirror.url)
-    @mirror.should_not be_cached
+    expect(@mirror).not_to be_cached
   end
 end