Add latest changes from gitlab-org/gitlab@master

5 files changed, 35 insertions, 4 deletions

diff --git a/changelogs/unreleased/mo-change-capybara-screenshots-name.yml b/changelogs/unreleased/mo-change-capybara-screenshots-name.yml
new file mode 100644
index 00000000000..d20ccd25522
--- /dev/null
+++ b/changelogs/unreleased/mo-change-capybara-screenshots-name.yml
@@ -0,0 +1,5 @@
+---
+title: Change capybara screenshots files names taken on tests failures
+merge_request: 26788
+author:
+type: changed
diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md
index 2af8eef14a6..ca493537535 100644
--- a/doc/subscriptions/index.md
+++ b/doc/subscriptions/index.md
@@ -4,7 +4,12 @@ type: index, reference
 
 # GitLab subscription
 
-Access to GitLab features is provided on a subscription basis. A subscription entitles users to the features of a specific GitLab tier. Each tier provides a set of features. A subscription is valid for 12 months.
+GitLab offers tiers of features. Your subscription determines which tier you have access to. Subscriptions are valid for 12 months.
+
+GitLab provides special subscriptions to participants in the [GitLab Education Program](https://about.gitlab.com/solutions/education/) and [GitLab Open Source Program](https://about.gitlab.com/solutions/open-source/). For details on obtaining and renewing these subscriptions, see:
+
+- [GitLab Education Program subscriptions](#gitlab-education-program-subscriptions)
+- [GitLab Open Source Program subscriptions](#gitlab-open-source-program-subscriptions)
 
 ## Choosing a GitLab subscription
 
@@ -353,6 +358,20 @@ Learn more about:
 - The tiers of [GitLab Support](https://about.gitlab.com/support/).
 - [Submit a request via the Support Portal](https://support.gitlab.com/hc/en-us/requests/new).
 
+## GitLab Education Program subscriptions
+
+To renew a [GitLab Education Program](https://about.gitlab.com/solutions/education/) subscription, send an email to `education@gitlab.com` with the following information:
+
+1. The number of seats for the renewal. You can add seats if needed.
+1. The use case for the license. Specifically, we need verification that the use meets the conditions of the [End User License Agreement](https://about.gitlab.com/terms/#edu-oss). Note that university infrastructure operations and information technology operations don't fall within the stated terms of the Education Program. For details, see the [Education FAQ](https://about.gitlab.com/solutions/education/#FAQ).
+1. The full name, email address, and phone number of the primary contact who will be signing the renewal quote. Only signatures by faculty or staff with proper signing authority on the behalf of the university will be accepted.
+
+After we receive the above information, we will process the request and return a renewal quote for signature. Please allow a minimum of 2 business days for return. Email us at `education@gitlab.com` with any questions.
+
+## GitLab Open Source Program subscriptions
+
+All requests for our GitLab Open Source program, including subscription renewals, must be made by using the [Open Source Program](https://about.gitlab.com/solutions/open-source/program/) application process. If you have any questions, send an email to `opensource@gitlab.com` for assistance.
+
 <!-- ## Troubleshooting
 
 Include any troubleshooting steps that you can foresee. If you know beforehand what issues
diff --git a/qa/qa/runtime/browser.rb b/qa/qa/runtime/browser.rb
index 69ba90702be..cb475dd4973 100644
--- a/qa/qa/runtime/browser.rb
+++ b/qa/qa/runtime/browser.rb
@@ -122,8 +122,10 @@ module QA
           driver.browser.save_screenshot(path)
         end
 
+        Capybara::Screenshot.append_timestamp = false
+
         Capybara::Screenshot.register_filename_prefix_formatter(:rspec) do |example|
-          ::File.join(QA::Runtime::Namespace.name, example.file_path.sub('./qa/specs/features/', ''))
+          ::File.join(QA::Runtime::Namespace.name, example.full_description.downcase.parameterize(separator: "_")[0..99])
         end
 
         Capybara.configure do |config|
diff --git a/qa/qa/specs/features/browser_ui/3_create/snippet/create_snippet_spec.rb b/qa/qa/specs/features/browser_ui/3_create/snippet/create_snippet_spec.rb
index 72156bf7f7b..dfcbf4b44c8 100644
--- a/qa/qa/specs/features/browser_ui/3_create/snippet/create_snippet_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/snippet/create_snippet_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  context 'Create', :smoke, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/issues/209928', type: :bug } do
+  context 'Create', :smoke do
     describe 'Snippet creation' do
       it 'User creates a snippet' do
         Flow::Login.sign_in
@@ -19,7 +19,7 @@ module QA
         Page::Dashboard::Snippet::Show.perform do |snippet|
           expect(snippet).to have_snippet_title('Snippet title')
           expect(snippet).to have_snippet_description('Snippet description')
-          expect(snippet).to have_visibility_type('Private')
+          expect(snippet).to have_visibility_type(/private/i)
           expect(snippet).to have_file_name('New snippet file name')
           expect(snippet).to have_file_content('Snippet file text')
         end
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index ca4a81773aa..9ac7d0df737 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -79,6 +79,11 @@ Capybara.ignore_hidden_elements = true
 Capybara.default_normalize_ws = true
 Capybara.enable_aria_label = true
 
+Capybara::Screenshot.append_timestamp = false
+
+Capybara::Screenshot.register_filename_prefix_formatter(:rspec) do |example|
+  ::File.join(QA::Runtime::Namespace.name, example.full_description.downcase.parameterize(separator: "_")[0..99])
+end
 # Keep only the screenshots generated from the last failing test suite
 Capybara::Screenshot.prune_strategy = :keep_last_run
 # From https://github.com/mattheworiordan/capybara-screenshot/issues/84#issuecomment-41219326