diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-15 16:32:34 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-15 16:32:34 +0000 |
| commit | 627a96875ee68e37b45192af3121f09032ea4bbf (patch) | |
| tree | 983781e7aaff8f50c0f81c27d9b352a63b3543cb /spec/views | |
| parent | d2f313dcbccc1e3642fb0ccdf0849e0ef4ec8e21 (diff) | |
| parent | 4af9d592c500d2d97ec091d10ba860488c3702ea (diff) | |
| download | gitlab-ce-627a96875ee68e37b45192af3121f09032ea4bbf.tar.gz | |
Merge branch 'rc/use-factory_bot_rails' into 'master'
Replace factory_girl_rails with factory_bot_rails
See merge request gitlab-org/gitlab-ce!15919
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/projects/jobs/show.html.haml_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/views/projects/jobs/show.html.haml_spec.rb b/spec/views/projects/jobs/show.html.haml_spec.rb index 6139529013f..6a67da79ec5 100644 --- a/spec/views/projects/jobs/show.html.haml_spec.rb +++ b/spec/views/projects/jobs/show.html.haml_spec.rb @@ -187,7 +187,7 @@ describe 'projects/jobs/show' do context 'when incomplete trigger_request is used' do before do - build.trigger_request = FactoryGirl.build(:ci_trigger_request, trigger: nil) + build.trigger_request = FactoryBot.build(:ci_trigger_request, trigger: nil) end it 'test should not render token block' do @@ -199,7 +199,7 @@ describe 'projects/jobs/show' do context 'when complete trigger_request is used' do before do - build.trigger_request = FactoryGirl.build(:ci_trigger_request) + build.trigger_request = FactoryBot.build(:ci_trigger_request) end it 'should render token' do |