From 26e0767a07b3cd714c0af92f1d84197519259214 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 7 Oct 2022 03:08:02 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/features/markdown/gitlab_flavored_markdown_spec.rb | 9 ++++++--- spec/features/search/user_searches_for_commits_spec.rb | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'spec/features') diff --git a/spec/features/markdown/gitlab_flavored_markdown_spec.rb b/spec/features/markdown/gitlab_flavored_markdown_spec.rb index e831d1be608..17fe2dab8f7 100644 --- a/spec/features/markdown/gitlab_flavored_markdown_spec.rb +++ b/spec/features/markdown/gitlab_flavored_markdown_spec.rb @@ -3,8 +3,6 @@ require 'spec_helper' RSpec.describe "GitLab Flavored Markdown" do - include CycleAnalyticsHelpers - let(:user) { create(:user) } let(:project) { create(:project) } let(:issue) { create(:issue, project: project) } @@ -24,7 +22,12 @@ RSpec.describe "GitLab Flavored Markdown" do let(:commit) { project.commit } before do - create_commit("fix #{issue.to_reference}\n\nask #{fred.to_reference} for details", project, user, 'master') + project.repository.commit_files( + user, + branch_name: 'master', + message: "fix #{issue.to_reference}\n\nask #{fred.to_reference} for details", + actions: [{ action: :create, file_path: 'a/new.file', content: 'This is a file' }] + ) end it "renders title in commits#index" do diff --git a/spec/features/search/user_searches_for_commits_spec.rb b/spec/features/search/user_searches_for_commits_spec.rb index 2dceda09d7c..a157483ce70 100644 --- a/spec/features/search/user_searches_for_commits_spec.rb +++ b/spec/features/search/user_searches_for_commits_spec.rb @@ -3,8 +3,6 @@ require 'spec_helper' RSpec.describe 'User searches for commits', :js do - include CycleAnalyticsHelpers - let(:project) { create(:project, :repository) } let(:sha) { '6d394385cf567f80a8fd85055db1ab4c5295806f' } let(:user) { create(:user) } @@ -34,7 +32,12 @@ RSpec.describe 'User searches for commits', :js do context 'when searching by message' do it 'finds a commit and holds on /search page' do - create_commit('Message referencing another sha: "deadbeef"', project, user, 'master') + project.repository.commit_files( + user, + message: 'Message referencing another sha: "deadbeef"', + branch_name: 'master', + actions: [{ action: :create, file_path: 'a/new.file', contents: 'new file' }] + ) submit_search('deadbeef') -- cgit v1.2.3