Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

5 files changed, 10 insertions, 32 deletions

diff --git a/spec/features/projects/show/developer_views_empty_project_instructions_spec.rb b/spec/features/projects/show/developer_views_empty_project_instructions_spec.rb
deleted file mode 100644
index 8d239cb2cbf..00000000000
--- a/spec/features/projects/show/developer_views_empty_project_instructions_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'Projects > Show > Developer views empty project instructions' do
-  let(:project) { create(:project, :empty_repo) }
-  let(:developer) { create(:user) }
-
-  before do
-    project.add_developer(developer)
-
-    sign_in(developer)
-  end
-
-  it 'displays "git clone" instructions' do
-    visit project_path(project)
-
-    expect(page).to have_content("git clone")
-  end
-end
diff --git a/spec/features/projects/show/no_password_spec.rb b/spec/features/projects/show/no_password_spec.rb
index 79cd65e5406..d18ff75b324 100644
--- a/spec/features/projects/show/no_password_spec.rb
+++ b/spec/features/projects/show/no_password_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'No Password Alert' do
       let(:user) { create(:user) }
 
       it 'shows no alert' do
-        expect(page).not_to have_content "You won't be able to pull or push project code via HTTP until you set a password on your account"
+        expect(page).not_to have_content "You won't be able to pull or push repositories via HTTP until you set a password on your account"
       end
     end
 
@@ -23,7 +23,7 @@ RSpec.describe 'No Password Alert' do
       let(:user) { create(:user, password_automatically_set: true) }
 
       it 'shows a password alert' do
-        expect(page).to have_content "You won't be able to pull or push project code via HTTP until you set a password on your account"
+        expect(page).to have_content "You won't be able to pull or push repositories via HTTP until you set a password on your account"
       end
     end
   end
@@ -41,7 +41,7 @@ RSpec.describe 'No Password Alert' do
         gitlab_sign_in_via('saml', user, 'my-uid')
         visit project_path(project)
 
-        expect(page).to have_content "You won't be able to pull or push project code via HTTP until you create a personal access token on your account"
+        expect(page).to have_content "You won't be able to pull or push repositories via HTTP until you create a personal access token on your account"
       end
     end
 
@@ -51,7 +51,7 @@ RSpec.describe 'No Password Alert' do
         gitlab_sign_in_via('saml', user, 'my-uid')
         visit project_path(project)
 
-        expect(page).not_to have_content "You won't be able to pull or push project code via HTTP until you create a personal access token on your account"
+        expect(page).not_to have_content "You won't be able to pull or push repositories via HTTP until you create a personal access token on your account"
       end
     end
   end
@@ -65,7 +65,7 @@ RSpec.describe 'No Password Alert' do
     end
 
     it 'shows no alert' do
-      expect(page).not_to have_content "You won't be able to pull or push project code via HTTP until you"
+      expect(page).not_to have_content "You won't be able to pull or push repositories via HTTP until you"
     end
   end
 end
diff --git a/spec/features/projects/show/schema_markup_spec.rb b/spec/features/projects/show/schema_markup_spec.rb
index e651798af23..1777b72cbf5 100644
--- a/spec/features/projects/show/schema_markup_spec.rb
+++ b/spec/features/projects/show/schema_markup_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe 'Projects > Show > Schema Markup' do
       expect(page).to have_selector('img[itemprop="image"]')
       expect(page).to have_selector('[itemprop="name"]', text: project.name)
       expect(page).to have_selector('[itemprop="identifier"]', text: "Project ID: #{project.id}")
-      expect(page).to have_selector('[itemprop="abstract"]', text: project.description)
+      expect(page).to have_selector('[itemprop="description"]', text: project.description)
       expect(page).to have_selector('[itemprop="license"]', text: project.repository.license.name)
       expect(find_all('[itemprop="keywords"]').map(&:text)).to match_array(project.tag_list.map(&:capitalize))
       expect(page).to have_selector('[itemprop="about"]')
diff --git a/spec/features/projects/show/user_sees_git_instructions_spec.rb b/spec/features/projects/show/user_sees_git_instructions_spec.rb
index 3b77fd7eebf..febdb70de86 100644
--- a/spec/features/projects/show/user_sees_git_instructions_spec.rb
+++ b/spec/features/projects/show/user_sees_git_instructions_spec.rb
@@ -122,13 +122,11 @@ RSpec.describe 'Projects > Show > User sees Git instructions' do
     context 'when project is not empty' do
       let_it_be(:project) { create(:project, :public, :repository) }
 
-      before do
-        visit(project_path(project))
-      end
-
       context 'when not signed in' do
         before do
           allow(Gitlab.config.gitlab).to receive(:host).and_return('www.example.com')
+
+          visit(project_path(project))
         end
 
         include_examples 'shows details of non empty project'
diff --git a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
index 189aa45ff75..9b51e867156 100644
--- a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
+++ b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe 'Projects > Show > User sees setup shortcut buttons' do
         visit project_path(project)
       end
 
-      it 'Project buttons are not visible' do
+      it 'project buttons are not visible' do
         visit project_path(project)
 
         page.within('.project-buttons') do
@@ -165,7 +165,7 @@ RSpec.describe 'Projects > Show > User sees setup shortcut buttons' do
 
         context 'when the project does not have a README' do
           it 'shows the single file editor "Add README" button' do
-            allow(project.repository).to receive(:readme).and_return(nil)
+            allow(project.repository).to receive(:readme_path).and_return(nil)
 
             visit project_path(project)