From 3a52deac114dda8a1ee0da597c148b0dfc5dcf35 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 11 Mar 2020 03:09:31 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- qa/qa/runtime/browser.rb | 4 +++- .../specs/features/browser_ui/3_create/snippet/create_snippet_spec.rb | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'qa') 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 -- cgit v1.2.3