summaryrefslogtreecommitdiff
path: root/spec/models/merge_request_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r--spec/models/merge_request_spec.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 0faca7668dd..4bf42ef99aa 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -38,12 +38,12 @@ describe MergeRequest do
end
describe "#mr_and_commit_notes" do
- let!(:merge_request) { Factory.create(:merge_request) }
+ let!(:merge_request) { create(:merge_request) }
before do
merge_request.stub(:commits) { [merge_request.project.commit] }
- Factory.create(:note, noteable: merge_request.commits.first)
- Factory.create(:note, noteable: merge_request)
+ create(:note, noteable: merge_request.commits.first)
+ create(:note, noteable: merge_request)
end
it "should include notes for commits" do
@@ -52,11 +52,11 @@ describe MergeRequest do
end
end
- subject { Factory.create(:merge_request) }
+ subject { create(:merge_request) }
describe '#is_being_reassigned?' do
it 'returns true if the merge_request assignee has changed' do
- subject.assignee = Factory(:user)
+ subject.assignee = create(:user)
subject.is_being_reassigned?.should be_true
end
it 'returns false if the merge request assignee has not changed' do
@@ -70,7 +70,7 @@ describe MergeRequest do
subject.is_being_closed?.should be_true
end
it 'returns false if the closed attribute has changed and is now false' do
- merge_request = Factory.create(:closed_merge_request)
+ merge_request = create(:closed_merge_request)
merge_request.closed = false
merge_request.is_being_closed?.should be_false
end
@@ -82,7 +82,7 @@ describe MergeRequest do
describe '#is_being_reopened?' do
it 'returns true if the closed attribute has changed and is now false' do
- merge_request = Factory.create(:closed_merge_request)
+ merge_request = create(:closed_merge_request)
merge_request.closed = false
merge_request.is_being_reopened?.should be_true
end