summaryrefslogtreecommitdiff
path: root/spec/features/projects/blobs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-03-22 00:16:43 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-03-22 00:16:43 +0000
commit6e3df404ce4365d20af0e06484528b29f92c31a3 (patch)
tree5c6b3eaf09be6e10611c59cf1209b707c7c9ab76 /spec/features/projects/blobs
parent9fe1a4945b8db40c6b5d7b3ce7c6dbc93cdf67be (diff)
downloadgitlab-ce-6e3df404ce4365d20af0e06484528b29f92c31a3.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/projects/blobs')
-rw-r--r--spec/features/projects/blobs/edit_spec.rb4
-rw-r--r--spec/features/projects/blobs/user_views_pipeline_editor_button_spec.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/projects/blobs/edit_spec.rb b/spec/features/projects/blobs/edit_spec.rb
index 144b4ed85cd..2b6b09ccc10 100644
--- a/spec/features/projects/blobs/edit_spec.rb
+++ b/spec/features/projects/blobs/edit_spec.rb
@@ -3,9 +3,9 @@
require 'spec_helper'
RSpec.describe 'Editing file blob', :js, feature_category: :projects do
- include Spec::Support::Helpers::Features::SourceEditorSpecHelpers
+ include Features::SourceEditorSpecHelpers
include TreeHelper
- include BlobSpecHelpers
+ include Features::BlobSpecHelpers
let_it_be(:project) { create(:project, :public, :repository) }
let_it_be(:merge_request) { create(:merge_request, source_project: project, source_branch: 'feature', target_branch: 'master') }
diff --git a/spec/features/projects/blobs/user_views_pipeline_editor_button_spec.rb b/spec/features/projects/blobs/user_views_pipeline_editor_button_spec.rb
index 2f67e909543..3b383793de2 100644
--- a/spec/features/projects/blobs/user_views_pipeline_editor_button_spec.rb
+++ b/spec/features/projects/blobs/user_views_pipeline_editor_button_spec.rb
@@ -3,7 +3,7 @@
require 'spec_helper'
RSpec.describe 'User views pipeline editor button on root ci config file', :js, feature_category: :projects do
- include BlobSpecHelpers
+ include Features::BlobSpecHelpers
let_it_be(:user) { create(:user) }
let_it_be(:project) { create(:project, :public, :repository) }