diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-19 14:45:15 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-19 14:45:15 +0200 |
| commit | 492dc82ced619206aeed7e3aaae393d85a4d3f40 (patch) | |
| tree | fb2f4006ab826a663a6a3f5c960e6286420f48c3 /spec/factories.rb | |
| parent | 587e16a4e3d171cfcf477388ca1e5c8c95c8c018 (diff) | |
| parent | a90574fab290233225375b1c9e9c232b0e540b52 (diff) | |
| download | gitlab-ce-492dc82ced619206aeed7e3aaae393d85a4d3f40.tar.gz | |
Merge pull request #6557 from tsigo/faster-merge-request-features
Speed up features/notes_on_merge_requests_spec
Diffstat (limited to 'spec/factories.rb')
| -rw-r--r-- | spec/factories.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/factories.rb b/spec/factories.rb index adde72d2e1e..148477d6389 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -158,6 +158,11 @@ FactoryGirl.define do state :reopened end + trait :simple do + source_branch "simple_merge_request" + target_branch "master" + end + factory :closed_merge_request, traits: [:closed] factory :reopened_merge_request, traits: [:reopened] factory :merge_request_with_diffs, traits: [:with_diffs] @@ -173,7 +178,6 @@ FactoryGirl.define do factory :note_on_issue, traits: [:on_issue], aliases: [:votable_note] factory :note_on_merge_request, traits: [:on_merge_request] factory :note_on_merge_request_diff, traits: [:on_merge_request, :on_diff] - factory :note_on_merge_request_with_attachment, traits: [:on_merge_request, :with_attachment] trait :on_commit do project factory: :project |