summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
Diffstat (limited to 'spec')
-rw-r--r--spec/models/merge_request_spec.rb2
-rw-r--r--spec/models/protected_branch_spec.rb9
2 files changed, 1 insertions, 10 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 5642ba7e29a..41f4ede5d89 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -40,7 +40,7 @@ describe MergeRequest do
let!(:merge_request) { create(:merge_request) }
before do
- merge_request.stub(:commits) { [merge_request.project.commit] }
+ merge_request.stub(:commits) { [merge_request.project.repository.commit] }
create(:note, commit_id: merge_request.commits.first.id, noteable_type: 'Commit')
create(:note, noteable: merge_request)
end
diff --git a/spec/models/protected_branch_spec.rb b/spec/models/protected_branch_spec.rb
index 0835666a101..c4d2e2f49f5 100644
--- a/spec/models/protected_branch_spec.rb
+++ b/spec/models/protected_branch_spec.rb
@@ -39,13 +39,4 @@ describe ProtectedBranch do
branch.destroy
end
end
-
- describe '#commit' do
- let(:branch) { create(:protected_branch) }
-
- it 'commits itself to its project' do
- branch.project.repository.should_receive(:commit).with(branch.name)
- branch.commit
- end
- end
end