diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-09-04 15:36:06 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-09-04 15:36:06 +0000 |
commit | 771cef9897674ed042a2dda49a8b9b9df7e147d9 (patch) | |
tree | 2b478b5be8390b6874f7e95436d228ea08a3c340 /qa | |
parent | 383dfd17622dd434940c858a57691d5306fc0607 (diff) | |
parent | c43a6bb3b76c1dd51343488226e5611848348f79 (diff) | |
download | gitlab-ce-771cef9897674ed042a2dda49a8b9b9df7e147d9.tar.gz |
Merge branch '50991-qa-page-shared-clonepanel-should-be-moved-to-page-component-clonepanel-qa' into 'master'
Resolve "[QA] Page::Shared::ClonePanel should be moved to Page::Component::ClonePanel"
Closes #50991
See merge request gitlab-org/gitlab-ce!21479
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa.rb | 7 | ||||
-rw-r--r-- | qa/qa/page/component/clone_panel.rb (renamed from qa/qa/page/shared/clone_panel.rb) | 4 | ||||
-rw-r--r-- | qa/qa/page/project/issue/show.rb | 2 | ||||
-rw-r--r-- | qa/qa/page/project/show.rb | 2 | ||||
-rw-r--r-- | qa/qa/page/project/wiki/show.rb | 4 |
5 files changed, 12 insertions, 7 deletions
@@ -1,3 +1,5 @@ +# frozen_string_literal: true + $: << File.expand_path(File.dirname(__FILE__)) Encoding.default_external = 'UTF-8' @@ -212,10 +214,6 @@ module QA end end - module Shared - autoload :ClonePanel, 'qa/page/shared/clone_panel' - end - module Profile autoload :PersonalAccessTokens, 'qa/page/profile/personal_access_tokens' end @@ -249,6 +247,7 @@ module QA # Classes describing components that are used by several pages. # module Component + autoload :ClonePanel, 'qa/page/component/clone_panel' autoload :Dropzone, 'qa/page/component/dropzone' autoload :Select2, 'qa/page/component/select2' end diff --git a/qa/qa/page/shared/clone_panel.rb b/qa/qa/page/component/clone_panel.rb index 73e3dff956d..8e8ff4e3bb0 100644 --- a/qa/qa/page/shared/clone_panel.rb +++ b/qa/qa/page/component/clone_panel.rb @@ -1,6 +1,8 @@ +# frozen_string_literal: true + module QA module Page - module Shared + module Component module ClonePanel def self.included(base) base.view 'app/views/shared/_clone_panel.html.haml' do diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb index 5bc0598a524..587a02163b9 100644 --- a/qa/qa/page/project/issue/show.rb +++ b/qa/qa/page/project/issue/show.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module QA module Page module Project diff --git a/qa/qa/page/project/show.rb b/qa/qa/page/project/show.rb index c751b472535..07b4d0b745d 100644 --- a/qa/qa/page/project/show.rb +++ b/qa/qa/page/project/show.rb @@ -2,7 +2,7 @@ module QA module Page module Project class Show < Page::Base - include Page::Shared::ClonePanel + include Page::Component::ClonePanel view 'app/views/projects/_last_push.html.haml' do element :create_merge_request diff --git a/qa/qa/page/project/wiki/show.rb b/qa/qa/page/project/wiki/show.rb index 044e514bab3..c47a715687f 100644 --- a/qa/qa/page/project/wiki/show.rb +++ b/qa/qa/page/project/wiki/show.rb @@ -1,9 +1,11 @@ +# frozen_string_literal: true + module QA module Page module Project module Wiki class Show < Page::Base - include Page::Shared::ClonePanel + include Page::Component::ClonePanel view 'app/views/projects/wikis/pages.html.haml' do element :clone_repository_link, 'Clone repository' |