diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 03:09:00 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 03:09:00 +0000 |
commit | 56201db1dc66f3a2d598f6f8da0bec170dc26ba1 (patch) | |
tree | 8317b0a17c76866b981b497b13786dadceee5abf /spec/presenters | |
parent | ce2a803dc413f289352deecbf2cfd32896c8b2ef (diff) | |
download | gitlab-ce-56201db1dc66f3a2d598f6f8da0bec170dc26ba1.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/presenters')
-rw-r--r-- | spec/presenters/ci/bridge_presenter_spec.rb | 6 | ||||
-rw-r--r-- | spec/presenters/ci/trigger_presenter_spec.rb | 6 | ||||
-rw-r--r-- | spec/presenters/event_presenter_spec.rb | 10 | ||||
-rw-r--r-- | spec/presenters/label_presenter_spec.rb | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/spec/presenters/ci/bridge_presenter_spec.rb b/spec/presenters/ci/bridge_presenter_spec.rb index 1c2eeced20c..2a4c40a7eaa 100644 --- a/spec/presenters/ci/bridge_presenter_spec.rb +++ b/spec/presenters/ci/bridge_presenter_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe Ci::BridgePresenter do - set(:project) { create(:project) } - set(:pipeline) { create(:ci_pipeline, project: project) } - set(:bridge) { create(:ci_bridge, pipeline: pipeline, status: :failed) } + let_it_be(:project) { create(:project) } + let_it_be(:pipeline) { create(:ci_pipeline, project: project) } + let_it_be(:bridge) { create(:ci_bridge, pipeline: pipeline, status: :failed) } subject(:presenter) do described_class.new(bridge) diff --git a/spec/presenters/ci/trigger_presenter_spec.rb b/spec/presenters/ci/trigger_presenter_spec.rb index ac3967f4f77..41cb436f928 100644 --- a/spec/presenters/ci/trigger_presenter_spec.rb +++ b/spec/presenters/ci/trigger_presenter_spec.rb @@ -3,10 +3,10 @@ require 'spec_helper' describe Ci::TriggerPresenter do - set(:user) { create(:user) } - set(:project) { create(:project) } + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project) } - set(:trigger) do + let_it_be(:trigger) do create(:ci_trigger, token: '123456789abcd', project: project) end diff --git a/spec/presenters/event_presenter_spec.rb b/spec/presenters/event_presenter_spec.rb index 79f5e359141..eb94d838370 100644 --- a/spec/presenters/event_presenter_spec.rb +++ b/spec/presenters/event_presenter_spec.rb @@ -5,11 +5,11 @@ require 'spec_helper' describe EventPresenter do include Gitlab::Routing.url_helpers - set(:group) { create(:group) } - set(:project) { create(:project, group: group) } - set(:target) { create(:milestone, project: project) } - set(:group_event) { create(:event, :created, project: nil, group: group, target: target) } - set(:project_event) { create(:event, :created, project: project, target: target) } + let_it_be(:group) { create(:group) } + let_it_be(:project) { create(:project, group: group) } + let_it_be(:target) { create(:milestone, project: project) } + let_it_be(:group_event) { create(:event, :created, project: nil, group: group, target: target) } + let_it_be(:project_event) { create(:event, :created, project: project, target: target) } describe '#resource_parent_name' do context 'with group event' do diff --git a/spec/presenters/label_presenter_spec.rb b/spec/presenters/label_presenter_spec.rb index e9f9657490d..9578d017af5 100644 --- a/spec/presenters/label_presenter_spec.rb +++ b/spec/presenters/label_presenter_spec.rb @@ -5,8 +5,8 @@ require 'spec_helper' describe LabelPresenter do include Gitlab::Routing.url_helpers - set(:group) { create(:group) } - set(:project) { create(:project, group: group) } + let_it_be(:group) { create(:group) } + let_it_be(:project) { create(:project, group: group) } let(:label) { build_stubbed(:label, project: project).present(issuable_subject: project) } let(:group_label) { build_stubbed(:group_label, group: group).present(issuable_subject: project) } |