diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-27 18:09:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-27 18:09:25 +0300 |
commit | e69aae81ead38d4740771a5c8f0f33a4f248a312 (patch) | |
tree | edeff4f4658db5ec3b3d6f658ddf018598af95bc /qa | |
parent | 8827c1d18473a3d84db181c89212975418a25e37 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r-- | qa/Gemfile | 2 | ||||
-rw-r--r-- | qa/Gemfile.lock | 2 | ||||
-rw-r--r-- | qa/qa/fixtures/auto_devops_rack/Gemfile.lock | 4 | ||||
-rw-r--r-- | qa/qa/page/project/wiki/sidebar.rb | 8 | ||||
-rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/wiki/project_based_directory_management_spec.rb | 31 |
5 files changed, 43 insertions, 4 deletions
diff --git a/qa/Gemfile b/qa/Gemfile index e2951db534a..bd59cc6e275 100644 --- a/qa/Gemfile +++ b/qa/Gemfile @@ -4,7 +4,7 @@ gem 'gitlab-qa' gem 'activesupport', '~> 6.0.3.1' # This should stay in sync with the root's Gemfile gem 'capybara', '~> 3.29.0' gem 'capybara-screenshot', '~> 1.0.23' -gem 'rake', '~> 12.3.0' +gem 'rake', '~> 12.3.3' gem 'rspec', '~> 3.7' gem 'selenium-webdriver', '~> 3.12' gem 'airborne', '~> 0.3.4' diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index c2b876e3b04..c75ec19c1be 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -128,7 +128,7 @@ DEPENDENCIES nokogiri (~> 1.10.9) parallel_tests (~> 2.29) pry-byebug (~> 3.5.1) - rake (~> 12.3.0) + rake (~> 12.3.3) rest-client (~> 2.1.0) rotp (~> 3.1.0) rspec (~> 3.7) diff --git a/qa/qa/fixtures/auto_devops_rack/Gemfile.lock b/qa/qa/fixtures/auto_devops_rack/Gemfile.lock index d44ccbb5e69..9c7c93fb553 100644 --- a/qa/qa/fixtures/auto_devops_rack/Gemfile.lock +++ b/qa/qa/fixtures/auto_devops_rack/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: rack (2.0.6) - rake (12.3.0) + rake (12.3.3) PLATFORMS ruby @@ -12,4 +12,4 @@ DEPENDENCIES rake BUNDLED WITH - 1.17.1 + 1.17.3 diff --git a/qa/qa/page/project/wiki/sidebar.rb b/qa/qa/page/project/wiki/sidebar.rb index dc27c23e4c3..3e1edcbbefb 100644 --- a/qa/qa/page/project/wiki/sidebar.rb +++ b/qa/qa/page/project/wiki/sidebar.rb @@ -18,6 +18,10 @@ module QA base.view 'app/views/shared/wikis/_sidebar_wiki_page.html.haml' do element :wiki_page_link end + + base.view 'app/views/shared/wikis/_wiki_directory.html.haml' do + element :wiki_directory_content + end end def click_clone_repository @@ -35,6 +39,10 @@ module QA def has_page_listed?(page_title) has_element? :wiki_page_link, page_name: page_title end + + def has_directory?(directory) + has_element? :wiki_directory_content, text: directory + end end end end diff --git a/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_directory_management_spec.rb b/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_directory_management_spec.rb new file mode 100644 index 00000000000..e0d54611731 --- /dev/null +++ b/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_directory_management_spec.rb @@ -0,0 +1,31 @@ +# frozen_string_literal: true + +module QA + RSpec.describe 'Create' do + context 'Wiki' do + let(:initial_wiki) { Resource::Wiki::ProjectPage.fabricate_via_api! } + let(:new_path) { "a/new/path" } + + before do + Flow::Login.sign_in + end + + it 'has changed the directory' do + initial_wiki.visit! + + Page::Project::Wiki::Show.perform(&:click_edit) + + Page::Project::Wiki::Edit.perform do |edit| + edit.set_title("#{new_path}/home") + edit.set_message('changing the path of the home page') + end + + Page::Project::Wiki::Edit.perform(&:click_save_changes) + + Page::Project::Wiki::Show.perform do |wiki| + expect(wiki).to have_directory(new_path) + end + end + end + end +end |