Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Bonmalais <vb.kouno@gmail.com>2012-11-06 07:31:55 +0400
committerVincent Bonmalais <vb.kouno@gmail.com>2012-11-13 15:27:45 +0400
commit80fb38de7abdfacbf5ad2e0150b934c1392721f0 (patch)
tree302ee55b21e8206ab44cef819a583803b9bb0c6f /spec/models/merge_request_spec.rb
parentd52f06f38013540a9798686aa37c4dad120c3d74 (diff)
Remove backward compatibility of factories.
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 be40c561adb..3267f6f685f 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -37,12 +37,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
@@ -51,11 +51,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
@@ -69,7 +69,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
@@ -81,7 +81,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