twig 1.4 → 1.5

data/spec/twig/commit_time_spec.rb

@@ -8,31 +8,33 @@ describe Twig::CommitTime do
   describe '#initialize' do
     it 'stores a Time object' do
       commit_time = Twig::CommitTime.new(@time, '99 days ago')
-      commit_time.instance_variable_get(:@time).should == @time
+      expect(commit_time.instance_variable_get(:@time)).to eq(@time)
     end
 
     it 'stores a "time ago" string as its shortened version' do
-      Twig::CommitTime.new(@time, '2 years ago').
-        instance_variable_get(:@time_ago).should == '2y ago'
-      Twig::CommitTime.new(@time, '2 months ago').
-        instance_variable_get(:@time_ago).should == '2mo ago'
-      Twig::CommitTime.new(@time, '2 weeks ago').
-        instance_variable_get(:@time_ago).should == '2w ago'
-      Twig::CommitTime.new(@time, '2 days ago').
-        instance_variable_get(:@time_ago).should == '2d ago'
-      Twig::CommitTime.new(@time, '2 hours ago').
-        instance_variable_get(:@time_ago).should == '2h ago'
-      Twig::CommitTime.new(@time, '2 minutes ago').
-        instance_variable_get(:@time_ago).should == '2m ago'
-      Twig::CommitTime.new(@time, '2 seconds ago').
-        instance_variable_get(:@time_ago).should == '2s ago'
+      expect(Twig::CommitTime.new(@time, '2 years, 2 months ago').
+        instance_variable_get(:@time_ago)).to eq('2y ago')
+      expect(Twig::CommitTime.new(@time, '2 years ago').
+        instance_variable_get(:@time_ago)).to eq('2y ago')
+      expect(Twig::CommitTime.new(@time, '2 months ago').
+        instance_variable_get(:@time_ago)).to eq('2mo ago')
+      expect(Twig::CommitTime.new(@time, '2 weeks ago').
+        instance_variable_get(:@time_ago)).to eq('2w ago')
+      expect(Twig::CommitTime.new(@time, '2 days ago').
+        instance_variable_get(:@time_ago)).to eq('2d ago')
+      expect(Twig::CommitTime.new(@time, '2 hours ago').
+        instance_variable_get(:@time_ago)).to eq('2h ago')
+      expect(Twig::CommitTime.new(@time, '2 minutes ago').
+        instance_variable_get(:@time_ago)).to eq('2m ago')
+      expect(Twig::CommitTime.new(@time, '2 seconds ago').
+        instance_variable_get(:@time_ago)).to eq('2s ago')
     end
   end
 
   describe '#to_i' do
     it 'returns the time as an integer' do
       commit_time = Twig::CommitTime.new(@time, '99 days ago')
-      commit_time.to_i.should == @time.to_i
+      expect(commit_time.to_i).to eq(@time.to_i)
     end
   end
 
@@ -40,8 +42,8 @@ describe Twig::CommitTime do
     it 'returns a formatted string, including time ago' do
       commit_time = Twig::CommitTime.new(@time, '99 days ago')
       result = commit_time.to_s
-      result.should include('2000-12-01')
-      result.should include('(99d ago)')
+      expect(result).to include('2000-12-01')
+      expect(result).to include('(99d ago)')
     end
   end
 end

data/spec/twig/display_spec.rb

@@ -7,20 +7,20 @@ describe Twig::Display do
 
   describe '#column' do
     it 'returns a string with an exact fixed width' do
-      @twig.column('foo', :width => 8).should == 'foo' + (' ' * 5)
+      expect(@twig.column('foo', :width => 8)).to eq('foo' + (' ' * 5))
     end
 
     it 'returns a string that fits a column exactly' do
-      @twig.column('asdfasdf', :width => 8).should == 'asdfasdf'
+      expect(@twig.column('asdfasdf', :width => 8)).to eq('asdfasdf')
     end
 
     it 'truncates a wide string with an ellipsis' do
-      @twig.column('asdfasdfasdf', :width => 8).should == 'asdfa...'
+      expect(@twig.column('asdfasdfasdf', :width => 8)).to eq('asdfa...')
     end
 
     it 'passes options through to `format_string`' do
       format_options = { :color => :red, :weight => :bold }
-      @twig.should_receive(:format_string).
+      expect(@twig).to receive(:format_string).
         with('foo' + (' ' * 5), format_options)
 
       @twig.column('foo', format_options)
@@ -29,52 +29,57 @@ describe Twig::Display do
 
   describe '#property_column_width' do
     it 'returns a default width if no property name is given' do
-      @twig.property_column_width.should ==
+      expect(@twig.property_column_width).to eq(
         Twig::Display::DEFAULT_PROPERTY_COLUMN_WIDTH
+      )
     end
 
     context 'with no custom column widths set' do
       before :each do
-        @twig.options[:property_width].should be_nil
+        expect(@twig.options[:property_width]).to be_nil
       end
 
       it 'returns a default width if a property name is given' do
-        @twig.property_column_width(:foo).should ==
+        expect(@twig.property_column_width(:foo)).to eq(
           Twig::Display::DEFAULT_PROPERTY_COLUMN_WIDTH
+        )
       end
 
       it 'returns a default width if :branch is given' do
-        @twig.property_column_width(:branch).should ==
+        expect(@twig.property_column_width(:branch)).to eq(
           Twig::Display::DEFAULT_BRANCH_COLUMN_WIDTH
+        )
       end
     end
 
     context 'with custom column widths set' do
       it 'returns a default width if a property name is given but it has no custom width' do
-        @twig.property_column_width(:baz).should ==
+        expect(@twig.property_column_width(:baz)).to eq(
           Twig::Display::DEFAULT_PROPERTY_COLUMN_WIDTH
+        )
       end
 
       it 'returns a custom width if a property name is given and it has a custom width' do
         @twig.set_option(:property_width, :foo => 20)
-        @twig.property_column_width(:foo).should == 20
+        expect(@twig.property_column_width(:foo)).to eq(20)
       end
 
       it 'returns a default width if :branch is given but it has no custom width' do
-        @twig.property_column_width(:branch).should ==
+        expect(@twig.property_column_width(:branch)).to eq(
           Twig::Display::DEFAULT_BRANCH_COLUMN_WIDTH
+        )
       end
 
       it 'returns a custom width if :branch is given but it has no custom width' do
         @twig.set_option(:property_width, :branch => 20)
-        @twig.property_column_width(:branch).should == 20
+        expect(@twig.property_column_width(:branch)).to eq(20)
       end
     end
   end
 
   describe '#branch_list_headers' do
     before :each do
-      Twig::Branch.stub(:all_property_names => %w[foo quux])
+      allow(Twig::Branch).to receive(:all_property_names) { %w[foo quux] }
     end
 
     it 'returns a string of branch properties and underlines' do
@@ -84,14 +89,18 @@ describe Twig::Display do
       date_time_column_width      = 35
       extra_property_column_width = 8
       column_gutter = @twig.column_gutter
-      result_lines[0].should == (' ' * date_time_column_width) + column_gutter +
+      expect(result_lines[0]).to eq(
+        (' ' * date_time_column_width) + column_gutter +
         'foo     ' + (' ' * extra_property_column_width) + column_gutter +
         'quux    ' + (' ' * extra_property_column_width) + column_gutter +
         '  branch'
-      result_lines[1].should == (' ' * date_time_column_width) + column_gutter +
+      )
+      expect(result_lines[1]).to eq(
+        (' ' * date_time_column_width) + column_gutter +
         '---     ' + (' ' * extra_property_column_width) + column_gutter +
         '----    ' + (' ' * extra_property_column_width) + column_gutter +
         '  ------'
+      )
     end
 
     it 'sets a header width' do
@@ -103,44 +112,51 @@ describe Twig::Display do
       date_time_column_width      = 35
       extra_property_column_width = 8
       column_gutter = @twig.column_gutter
-      result_lines[0].should == (' ' * date_time_column_width) + column_gutter +
+      expect(result_lines[0]).to eq(
+        (' ' * date_time_column_width) + column_gutter +
         'foo '     + column_gutter +
         'quux    ' + (' ' * extra_property_column_width) + column_gutter +
         '  branch'
-      result_lines[1].should == (' ' * date_time_column_width) + column_gutter +
+      )
+      expect(result_lines[1]).to eq(
+        (' ' * date_time_column_width) + column_gutter +
         '--- '     + column_gutter +
         '----    ' + (' ' * extra_property_column_width) + column_gutter +
         '  ------'
+      )
     end
 
     it 'sets a header color' do
       result = @twig.branch_list_headers({ :header_color => :green })
       header_line = result.split("\n").first
       color = Twig::Display::COLORS[:green]
-      header_line.gsub(/\s/, '').should ==
+      expect(header_line.gsub(/\s/, '')).to eq(
         "\e[#{color}mfoo\e[0m" <<
         "\e[#{color}mquux\e[0m" <<
         "\e[#{color}mbranch\e[0m"
+      )
     end
 
     it 'sets a header weight' do
       result = @twig.branch_list_headers({ :header_weight => :bold })
       header_line = result.split("\n").first
       weight = Twig::Display::WEIGHTS[:bold]
-      header_line.gsub(/\s/, '').should ==
+      expect(header_line.gsub(/\s/, '')).to eq(
         "\e[#{weight}mfoo\e[0m" <<
         "\e[#{weight}mquux\e[0m" <<
         "\e[#{weight}mbranch\e[0m"
+      )
     end
 
     it 'sets a header color and weight' do
       result = @twig.branch_list_headers({ :header_color => :red, :header_weight => :bold })
       header_line = result.split("\n").first
       color, weight = Twig::Display::COLORS[:red], Twig::Display::WEIGHTS[:bold]
-      header_line.gsub(/\s/, '').should ==
+      expect(header_line.gsub(/\s/, '')).to eq(
         "\e[#{color};#{weight}mfoo\e[0m" <<
         "\e[#{color};#{weight}mquux\e[0m" <<
         "\e[#{color};#{weight}mbranch\e[0m"
+      )
     end
   end
 
@@ -148,20 +164,18 @@ describe Twig::Display do
     before :each do
       @current_branch = Twig::Branch.new('my-branch')
       @other_branch   = Twig::Branch.new('other-branch')
-      @twig.should_receive(:current_branch_name).and_return(@current_branch.name)
-      Twig::Branch.stub(:all_property_names => %w[foo bar])
-      @current_branch.stub(:get_properties => {
-        'foo' => 'foo!',
-        'bar' => 'bar!'
-      })
-      @other_branch.stub(:get_properties => {
-        'foo' => 'foo!',
-        'bar' => 'bar!'
-      })
+      expect(@twig).to receive(:current_branch_name).and_return(@current_branch.name)
+      allow(Twig::Branch).to receive(:all_property_names) { %w[foo bar] }
+      allow(@current_branch).to receive(:get_properties) do
+        { 'foo' => 'foo!', 'bar' => 'bar!' }
+      end
+      allow(@other_branch).to receive(:get_properties) do
+        { 'foo' => 'foo!', 'bar' => 'bar!' }
+      end
       commit_time = Twig::CommitTime.new(Time.now, '')
-      commit_time.should_receive(:to_s).and_return('2000-01-01')
-      @current_branch.stub(:last_commit_time => commit_time)
-      @other_branch.stub(:last_commit_time => commit_time)
+      expect(commit_time).to receive(:to_s).and_return('2000-01-01')
+      allow(@current_branch).to receive(:last_commit_time) { commit_time }
+      allow(@other_branch).to receive(:last_commit_time) { commit_time }
     end
 
     it 'returns a line for the current branch' do
@@ -171,38 +185,38 @@ describe Twig::Display do
 
       result = @twig.branch_list_line(branch)
 
-      result.should =~ /2000-01-01\s+foo!\s+bar!\s+#{branch_regexp}/
+      expect(result).to match(/2000-01-01\s+foo!\s+bar!\s+#{branch_regexp}/)
     end
 
     it 'returns a line for a branch other than the current branch' do
       branch = @other_branch
       result = @twig.branch_list_line(branch)
-      result.should =~ /2000-01-01\s+foo!\s+bar!\s+#{Regexp.escape(branch.name)}/
+      expect(result).to match(/2000-01-01\s+foo!\s+bar!\s+#{Regexp.escape(branch.name)}/)
     end
 
     it 'returns a line containing an empty branch property' do
-      Twig::Branch.should_receive(:all_property_names).and_return(%w[foo bar baz])
+      expect(Twig::Branch).to receive(:all_property_names).and_return(%w[foo bar baz])
       branch = @other_branch
 
       result = @twig.branch_list_line(branch)
 
       empty_indicator = Twig::Display::EMPTY_BRANCH_PROPERTY_INDICATOR
-      result.should =~ /2000-01-01\s+foo!\s+bar!\s+#{empty_indicator}\s+#{Regexp.escape(branch.name)}/
+      expect(result).to match(/2000-01-01\s+foo!\s+bar!\s+#{empty_indicator}\s+#{Regexp.escape(branch.name)}/)
     end
 
     it 'changes line break characters to spaces' do
       branch = @current_branch
       property_names = %w[foo bar linebreaks]
-      branch.should_receive(:get_properties).with(property_names).and_return(
+      expect(branch).to receive(:get_properties).with(property_names).and_return(
         'foo' => 'foo!',
         'bar' => 'bar!',
         'linebreaks' => "line\r\nbreaks!"
       )
-      Twig::Branch.should_receive(:all_property_names).and_return(property_names)
+      expect(Twig::Branch).to receive(:all_property_names).and_return(property_names)
 
       result = @twig.branch_list_line(branch)
 
-      result.should include('line breaks')
+      expect(result).to include('line breaks')
     end
 
     it 'returns a line with custom column widths' do
@@ -212,11 +226,12 @@ describe Twig::Display do
       result = @twig.branch_list_line(branch)
 
       column_gutter = @twig.column_gutter
-      result.should ==
+      expect(result).to eq(
         '2000-01-01' + (' ' * 25) + column_gutter +
         'foo! ' + column_gutter +
         'bar!' + (' ' * 12) + column_gutter +
         '  ' + branch.name
+      )
     end
 
     context 'with a custom width for the branch column' do
@@ -233,11 +248,12 @@ describe Twig::Display do
         unformatted_result = @twig.unformat_string(result)
 
         column_gutter = @twig.column_gutter
-        unformatted_result.should ==
+        expect(unformatted_result).to eq(
           '2000-01-01' + (' ' * 25) + column_gutter +
           'foo!' + (' ' * 12) + column_gutter +
           'bar!' + (' ' * 12) + column_gutter +
           indicator + 'my-br...'
+        )
       end
 
       it 'returns a line for a branch other than the current branch' do
@@ -246,67 +262,102 @@ describe Twig::Display do
         result = @twig.branch_list_line(branch)
 
         column_gutter = @twig.column_gutter
-        result.should ==
+        expect(result).to eq(
           '2000-01-01' + (' ' * 25) + column_gutter +
           'foo!' + (' ' * 12) + column_gutter +
           'bar!' + (' ' * 12) + column_gutter +
           '  ' + 'other...'
+        )
       end
     end
   end
 
+  describe '#branches_json' do
+    before :each do
+      @commit_time = Twig::CommitTime.new(Time.now, '')
+      allow(@commit_time).to receive(:to_s).and_return('2000-01-01')
+    end
+
+    it 'returns JSON for an array of branches' do
+      branches = [
+        Twig::Branch.new('branch1'),
+        Twig::Branch.new('branch2')
+      ]
+      branch_hashes = [
+        { 'name' => 'branch1' },
+        { 'name' => 'branch2' }
+      ]
+      expect(@twig).to receive(:branches).and_return(branches)
+      expect(branches[0]).to receive(:to_hash).and_return(branch_hashes[0])
+      expect(branches[1]).to receive(:to_hash).and_return(branch_hashes[1])
+
+      result = @twig.branches_json
+
+      expect(result).to eq({ 'branches' => branch_hashes }.to_json)
+    end
+
+    it 'returns JSON for an empty array if there are no branches' do
+      expect(@twig).to receive(:branches).and_return([])
+      result = @twig.branches_json
+      expect(result).to eq({ 'branches' => [] }.to_json)
+    end
+  end
+
   describe '#format_string' do
     it 'returns a plain string' do
-      @twig.format_string('foo', {}).should == 'foo'
+      expect(@twig.format_string('foo', {})).to eq('foo')
     end
 
     it 'returns a string with a color code' do
-      @twig.format_string('foo', :color => :red).
-        should == "\e[#{Twig::Display::COLORS[:red]}mfoo\e[0m"
+      expect(@twig.format_string('foo', :color => :red)).to eq(
+        "\e[#{Twig::Display::COLORS[:red]}mfoo\e[0m"
+      )
     end
 
     it 'returns a string with a weight code' do
-      @twig.format_string('foo', :weight => :bold).
-        should == "\e[#{Twig::Display::WEIGHTS[:bold]}mfoo\e[0m"
+      expect(@twig.format_string('foo', :weight => :bold)).to eq(
+        "\e[#{Twig::Display::WEIGHTS[:bold]}mfoo\e[0m"
+      )
     end
 
     it 'returns a string with a color and weight code 'do
     color_code  = Twig::Display::COLORS[:red]
     weight_code = Twig::Display::WEIGHTS[:bold]
 
-    @twig.format_string('foo', :color => :red, :weight => :bold).
-      should == "\e[#{color_code};#{weight_code}mfoo\e[0m"
+    expect(@twig.format_string('foo', :color => :red, :weight => :bold)).to eq(
+      "\e[#{color_code};#{weight_code}mfoo\e[0m"
+    )
     end
   end
 
   describe '#unformat_string' do
     it 'unformats a plain text string' do
       string = 'foo'
-      @twig.unformat_string(string).should == string
+      expect(@twig.unformat_string(string)).to eq(string)
     end
 
     it 'unformats a string with color' do
       string = 'foo'
       formatted_string = @twig.format_string(string, :color => :red)
-      formatted_string.size.should > 3 # Precondition
+      expect(formatted_string.size).to be > 3
 
-      @twig.unformat_string(formatted_string).should == string
+      expect(@twig.unformat_string(formatted_string)).to eq(string)
     end
 
     it 'unformats a string with weight' do
       string = 'foo'
       formatted_string = @twig.format_string(string, :weight => :bold)
-      formatted_string.size.should > 3 # Precondition
+      expect(formatted_string.size).to be > 3
 
-      @twig.unformat_string(formatted_string).should == string
+      expect(@twig.unformat_string(formatted_string)).to eq(string)
     end
 
     it 'unformats a string with color and weight' do
       string = 'foo'
       formatted_string = @twig.format_string(string, :color => :red, :weight => :bold)
-      formatted_string.size.should > 3 # Precondition
+      expect(formatted_string.size).to be > 3
 
-      @twig.unformat_string(formatted_string).should == string
+      expect(@twig.unformat_string(formatted_string)).to eq(string)
     end
   end
 end

data/spec/twig/github_spec.rb

@@ -15,67 +15,72 @@ describe Twig::GithubRepo do
 
   describe '#initialize' do
     it 'runs the given block' do
-      Twig.stub(:repo?) { true }
-      Twig::GithubRepo.any_instance.stub(:origin_url) { @github_ssh_read_write_url }
-      Twig::GithubRepo.any_instance.stub(:username)   { 'username' }
-      Twig::GithubRepo.any_instance.stub(:repository) { 'repository' }
+      origin_url = @github_ssh_read_write_url
+      allow(Twig).to receive(:repo?) { true }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:username)   { 'username' }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:repository) { 'repository' }
 
       block_has_run = false
       Twig::GithubRepo.new do |gh_repo|
         block_has_run = true
       end
 
-      block_has_run.should be_true
+      expect(block_has_run).to be_true
     end
 
     it 'aborts if this is not a Git repo' do
-      Twig.stub(:repo?) { false }
-      Twig::GithubRepo.any_instance.stub(:origin_url) { @github_ssh_read_write_url }
-      Twig::GithubRepo.any_instance.stub(:username)   { 'username' }
-      Twig::GithubRepo.any_instance.stub(:repository) { 'repository' }
-      Twig::GithubRepo.any_instance.should_receive(:abort) do |message|
-        message.should include('not a git repository')
+      origin_url = @github_ssh_read_write_url
+      allow(Twig).to receive(:repo?) { false }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:username)   { 'username' }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:repository) { 'repository' }
+      expect_any_instance_of(Twig::GithubRepo).to receive(:abort) do |message|
+        expect(message).to include('not a git repository')
       end
 
       Twig::GithubRepo.new { |gh_repo| } # Do nothing
     end
 
     it 'aborts if the repo origin URL is empty' do
-      Twig.stub(:repo?) { true }
-      Twig::GithubRepo.any_instance.stub(:origin_url) { '' }
-      Twig::GithubRepo.any_instance.stub(:username)   { 'username' }
-      Twig::GithubRepo.any_instance.stub(:repository) { 'repository' }
-      Twig::GithubRepo.any_instance.should_receive(:abort_for_non_github_repo)
+      allow(Twig).to receive(:repo?) { true }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { '' }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:username)   { 'username' }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:repository) { 'repository' }
+      expect_any_instance_of(Twig::GithubRepo).to receive(:abort_for_non_github_repo)
 
       Twig::GithubRepo.new { |gh_repo| } # Do nothing
     end
 
     it 'aborts if the repo username is empty' do
-      Twig.stub(:repo?) { true }
-      Twig::GithubRepo.any_instance.stub(:origin_url) { @github_ssh_read_write_url }
-      Twig::GithubRepo.any_instance.stub(:username)   { '' }
-      Twig::GithubRepo.any_instance.stub(:repository) { 'repository' }
-      Twig::GithubRepo.any_instance.should_receive(:abort_for_non_github_repo)
+      origin_url = @github_ssh_read_write_url
+      allow(Twig).to receive(:repo?) { true }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:username)   { '' }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:repository) { 'repository' }
+      expect_any_instance_of(Twig::GithubRepo).to receive(:abort_for_non_github_repo)
 
       Twig::GithubRepo.new { |gh_repo| } # Do nothing
     end
 
     it 'aborts if the repo name is empty' do
-      Twig.stub(:repo?) { true }
-      Twig::GithubRepo.any_instance.stub(:origin_url) { @github_ssh_read_write_url }
-      Twig::GithubRepo.any_instance.stub(:username)   { 'username' }
-      Twig::GithubRepo.any_instance.stub(:repository) { '' }
-      Twig::GithubRepo.any_instance.should_receive(:abort_for_non_github_repo)
+      origin_url = @github_ssh_read_write_url
+      allow(Twig).to receive(:repo?) { true }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:username)   { 'username' }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:repository) { '' }
+      expect_any_instance_of(Twig::GithubRepo).to receive(:abort_for_non_github_repo)
 
       Twig::GithubRepo.new { |gh_repo| } # Do nothing
     end
 
     it 'aborts if the repo is not hosted by GitHub' do
-      Twig.stub(:repo?) { true }
-      Twig::GithubRepo.any_instance.stub(:origin_url) { @generic_ssh_read_write_url }
-      Twig::GithubRepo.any_instance.stub(:username)   { 'username' }
-      Twig::GithubRepo.any_instance.stub(:repository) { 'repository' }
-      Twig::GithubRepo.any_instance.should_receive(:abort_for_non_github_repo)
+      origin_url = @generic_ssh_read_write_url
+      allow(Twig).to receive(:repo?) { true }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:username)   { 'username' }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:repository) { 'repository' }
+      expect_any_instance_of(Twig::GithubRepo).to receive(:abort_for_non_github_repo)
 
       Twig::GithubRepo.new { |gh_repo| } # Do nothing
     end
@@ -83,14 +88,14 @@ describe Twig::GithubRepo do
 
   describe '#origin_url' do
     before :each do
-      Twig.stub(:repo?) { true }
-      Twig::GithubRepo.any_instance.stub(:username)   { 'username' }
-      Twig::GithubRepo.any_instance.stub(:repository) { 'repository' }
+      allow(Twig).to receive(:repo?) { true }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:username)   { 'username' }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:repository) { 'repository' }
     end
 
     it 'gets the origin URL from the repo config' do
       origin_url = @github_ssh_read_write_url
-      Twig.should_receive(:run).
+      expect(Twig).to receive(:run).
         with('git config remote.origin.url').once { origin_url }
 
       Twig::GithubRepo.new do |gh_repo|
@@ -101,36 +106,37 @@ describe Twig::GithubRepo do
 
   describe '#origin_url_parts' do
     before :each do
-      Twig.stub(:repo?) { true }
-      Twig::GithubRepo.any_instance.stub(:username)   { 'username' }
-      Twig::GithubRepo.any_instance.stub(:repository) { 'repository' }
+      allow(Twig).to receive(:repo?) { true }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:username)   { 'username' }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:repository) { 'repository' }
     end
 
     it 'splits the origin URL into useful parts' do
       origin_url = @github_ssh_read_write_url
-      Twig::GithubRepo.any_instance.stub(:origin_url) { origin_url }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
 
       origin_url_parts = nil
       Twig::GithubRepo.new do |gh_repo|
         origin_url_parts = gh_repo.origin_url_parts
       end
 
-      origin_url_parts.should == %w[
+      expect(origin_url_parts).to eq(%w[
         git@github.com
         rondevera
         twig.git
-      ]
+      ])
     end
   end
 
   describe '#github_repo?' do
     before :each do
-      Twig.stub(:repo?) { true }
+      allow(Twig).to receive(:repo?) { true }
     end
 
     context 'with a GitHub HTTPS URL' do
       before :each do
-        Twig::GithubRepo.any_instance.stub(:origin_url) { @github_https_url }
+        origin_url = @github_https_url
+        allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
       end
 
       it 'returns true' do
@@ -139,13 +145,14 @@ describe Twig::GithubRepo do
           is_github_repo = gh_repo.github_repo?
         end
 
-        is_github_repo.should be_true
+        expect(is_github_repo).to be_true
       end
     end
 
     context 'with a GitHub Git read-only URL' do
       before :each do
-        Twig::GithubRepo.any_instance.stub(:origin_url) { @github_git_read_only_url }
+        origin_url = @github_git_read_only_url
+        allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
       end
 
       it 'returns true' do
@@ -154,13 +161,14 @@ describe Twig::GithubRepo do
           is_github_repo = gh_repo.github_repo?
         end
 
-        is_github_repo.should be_true
+        expect(is_github_repo).to be_true
       end
     end
 
     context 'with a GitHub SSH read/write URL' do
       before :each do
-        Twig::GithubRepo.any_instance.stub(:origin_url) { @github_ssh_read_write_url }
+        origin_url = @github_ssh_read_write_url
+        allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
       end
 
       it 'returns true' do
@@ -169,14 +177,15 @@ describe Twig::GithubRepo do
           is_github_repo = gh_repo.github_repo?
         end
 
-        is_github_repo.should be_true
+        expect(is_github_repo).to be_true
       end
     end
 
     context 'with a generic HTTPS URL' do
       before :each do
-        Twig::GithubRepo.any_instance.stub(:origin_url) { @generic_https_url }
-        Twig::GithubRepo.any_instance.stub(:abort_for_non_github_repo)
+        origin_url = @generic_https_url
+        allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
+        allow_any_instance_of(Twig::GithubRepo).to receive(:abort_for_non_github_repo)
       end
 
       it 'returns false' do
@@ -185,14 +194,15 @@ describe Twig::GithubRepo do
           is_github_repo = gh_repo.github_repo?
         end
 
-        is_github_repo.should be_false
+        expect(is_github_repo).to be_false
       end
     end
 
     context 'with a generic Git read-only URL' do
       before :each do
-        Twig::GithubRepo.any_instance.stub(:origin_url) { @generic_git_read_only_url }
-        Twig::GithubRepo.any_instance.stub(:abort_for_non_github_repo)
+        origin_url = @generic_git_read_only_url
+        allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
+        allow_any_instance_of(Twig::GithubRepo).to receive(:abort_for_non_github_repo)
       end
 
       it 'returns false' do
@@ -201,14 +211,15 @@ describe Twig::GithubRepo do
           is_github_repo = gh_repo.github_repo?
         end
 
-        is_github_repo.should be_false
+        expect(is_github_repo).to be_false
       end
     end
 
     context 'with a generic SSH read/write URL' do
       before :each do
-        Twig::GithubRepo.any_instance.stub(:origin_url) { @generic_ssh_read_write_url }
-        Twig::GithubRepo.any_instance.stub(:abort_for_non_github_repo)
+        origin_url = @generic_ssh_read_write_url
+        allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
+        allow_any_instance_of(Twig::GithubRepo).to receive(:abort_for_non_github_repo)
       end
 
       it 'returns false' do
@@ -217,82 +228,88 @@ describe Twig::GithubRepo do
           is_github_repo = gh_repo.github_repo?
         end
 
-        is_github_repo.should be_false
+        expect(is_github_repo).to be_false
       end
     end
   end
 
   describe '#username' do
     before :each do
-      Twig.stub(:repo?) { true }
-      Twig::GithubRepo.any_instance.stub(:repository) { 'repository' }
+      allow(Twig).to receive(:repo?) { true }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:repository) { 'repository' }
     end
 
     it 'gets the username for a HTTPS repo' do
-      Twig::GithubRepo.any_instance.stub(:origin_url) { @github_ssh_read_write_url }
+      origin_url = @github_ssh_read_write_url
+      allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
       username = nil
       Twig::GithubRepo.new do |gh_repo|
         username = gh_repo.username
       end
 
-      username.should == 'rondevera'
+      expect(username).to eq('rondevera')
     end
 
     it 'gets the username for a Git read-only repo' do
-      Twig::GithubRepo.any_instance.stub(:origin_url) { @github_git_read_only_url }
+      origin_url = @github_git_read_only_url
+      allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
       username = nil
       Twig::GithubRepo.new do |gh_repo|
         username = gh_repo.username
       end
 
-      username.should == 'rondevera'
+      expect(username).to eq('rondevera')
     end
 
     it 'gets the username for a SSH read/write repo' do
-      Twig::GithubRepo.any_instance.stub(:origin_url) { @github_ssh_read_write_url }
+      origin_url = @github_ssh_read_write_url
+      allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
       username = nil
       Twig::GithubRepo.new do |gh_repo|
         username = gh_repo.username
       end
 
-      username.should == 'rondevera'
+      expect(username).to eq('rondevera')
     end
   end
 
   describe '#repository' do
     before :each do
-      Twig.stub(:repo?) { true }
-      Twig::GithubRepo.any_instance.stub(:username) { 'repository' }
+      allow(Twig).to receive(:repo?) { true }
+      allow_any_instance_of(Twig::GithubRepo).to receive(:username) { 'repository' }
     end
 
     it 'gets the repo name for a HTTPS repo' do
-      Twig::GithubRepo.any_instance.stub(:origin_url) { @github_https_url }
+      origin_url = @github_https_url
+      allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
       repository = nil
       Twig::GithubRepo.new do |gh_repo|
         repository = gh_repo.repository
       end
 
-      repository.should == 'twig'
+      expect(repository).to eq('twig')
     end
 
     it 'gets the repo name for a Git read-only repo' do
-      Twig::GithubRepo.any_instance.stub(:origin_url) { @github_git_read_only_url }
+      origin_url = @github_git_read_only_url
+      allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
       repository = nil
       Twig::GithubRepo.new do |gh_repo|
         repository = gh_repo.repository
       end
 
-      repository.should == 'twig'
+      expect(repository).to eq('twig')
     end
 
     it 'gets the repo name for a SSH read/write repo' do
-      Twig::GithubRepo.any_instance.stub(:origin_url) { @github_ssh_read_write_url }
+      origin_url = @github_ssh_read_write_url
+      allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
       repository = nil
       Twig::GithubRepo.new do |gh_repo|
         repository = gh_repo.repository
       end
 
-      repository.should == 'twig'
+      expect(repository).to eq('twig')
     end
   end