diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-18 21:07:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-18 21:07:53 +0300 |
commit | e69b62ceed2f15335d9526923f8f72f5ca5ea6aa (patch) | |
tree | e36510511cb555865375117fd1c2208e09eea970 /spec/views | |
parent | 493e288e6de17f2d85fe981f8bb0b9dfabdf9c6d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/views')
-rw-r--r-- | spec/views/profiles/preferences/show.html.haml_spec.rb | 2 | ||||
-rw-r--r-- | spec/views/projects/pipelines/show.html.haml_spec.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/views/profiles/preferences/show.html.haml_spec.rb b/spec/views/profiles/preferences/show.html.haml_spec.rb index 9a177ba0394..c20b4424129 100644 --- a/spec/views/profiles/preferences/show.html.haml_spec.rb +++ b/spec/views/profiles/preferences/show.html.haml_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' RSpec.describe 'profiles/preferences/show' do using RSpec::Parameterized::TableSyntax - let_it_be(:user) { build(:user) } + let_it_be(:user) { create_default(:user) } before do assign(:user, user) diff --git a/spec/views/projects/pipelines/show.html.haml_spec.rb b/spec/views/projects/pipelines/show.html.haml_spec.rb index 81a11874886..3c15d5846e9 100644 --- a/spec/views/projects/pipelines/show.html.haml_spec.rb +++ b/spec/views/projects/pipelines/show.html.haml_spec.rb @@ -11,6 +11,7 @@ RSpec.describe 'projects/pipelines/show', feature_category: :pipeline_compositio let(:presented_pipeline) { pipeline.present(current_user: user) } before do + stub_feature_flags(pipeline_details_header_vue: false) assign(:project, project) assign(:pipeline, presented_pipeline) allow(view).to receive(:current_user) { user } |