diff options
| author | Elvin Efendi <elvin.efendiyev@gmail.com> | 2015-12-08 18:51:07 -0500 |
|---|---|---|
| committer | Elvin Efendi <elvin.efendiyev@gmail.com> | 2015-12-08 18:51:07 -0500 |
| commit | 0362787087a84d3fd8dfd0b38a657d73947a8753 (patch) | |
| tree | 322868ba1cfb4953452033813374b32711d0faf5 /spec/githubrepo_spec.rb | |
| parent | 1df0f01c6166e1ef1653c90818aaa47118af4700 (diff) | |
| parent | b6a9c3ae528de0b577ff3f7c601b4ca5b641185d (diff) | |
Merge pull request #10 from Shopify/detect-conflict
Detect conflict
Diffstat (limited to 'spec/githubrepo_spec.rb')
| -rw-r--r-- | spec/githubrepo_spec.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/githubrepo_spec.rb b/spec/githubrepo_spec.rb index 9b509e4..07296f3 100644 --- a/spec/githubrepo_spec.rb +++ b/spec/githubrepo_spec.rb @@ -18,8 +18,9 @@ describe Oxidized::Node do repo.expects(:remotes).returns({'origin' => remote}) repo.expects(:path).returns('foo.git') repo_head = mock() - repo_head.expects(:name).returns('origin/master') - repo.expects(:head).returns(repo_head) + repo_head.expects(:name).twice.returns('origin/master') + repo.expects(:head).twice.returns(repo_head) + repo.expects(:fetch).returns(true) repo.expects(:branches).returns({}) Rugged::Repository.expects(:new).with('foo.git').returns(repo) end |