Commit 771cef98 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch...

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
parents 383dfd17 c43a6bb3
# frozen_string_literal: true
$: << File.expand_path(File.dirname(__FILE__)) $: << File.expand_path(File.dirname(__FILE__))
Encoding.default_external = 'UTF-8' Encoding.default_external = 'UTF-8'
...@@ -212,10 +214,6 @@ module QA ...@@ -212,10 +214,6 @@ module QA
end end
end end
module Shared
autoload :ClonePanel, 'qa/page/shared/clone_panel'
end
module Profile module Profile
autoload :PersonalAccessTokens, 'qa/page/profile/personal_access_tokens' autoload :PersonalAccessTokens, 'qa/page/profile/personal_access_tokens'
end end
...@@ -249,6 +247,7 @@ module QA ...@@ -249,6 +247,7 @@ module QA
# Classes describing components that are used by several pages. # Classes describing components that are used by several pages.
# #
module Component module Component
autoload :ClonePanel, 'qa/page/component/clone_panel'
autoload :Dropzone, 'qa/page/component/dropzone' autoload :Dropzone, 'qa/page/component/dropzone'
autoload :Select2, 'qa/page/component/select2' autoload :Select2, 'qa/page/component/select2'
end end
......
# frozen_string_literal: true
module QA module QA
module Page module Page
module Shared module Component
module ClonePanel module ClonePanel
def self.included(base) def self.included(base)
base.view 'app/views/shared/_clone_panel.html.haml' do base.view 'app/views/shared/_clone_panel.html.haml' do
......
# frozen_string_literal: true
module QA module QA
module Page module Page
module Project module Project
......
...@@ -2,7 +2,7 @@ module QA ...@@ -2,7 +2,7 @@ module QA
module Page module Page
module Project module Project
class Show < Page::Base class Show < Page::Base
include Page::Shared::ClonePanel include Page::Component::ClonePanel
view 'app/views/projects/_last_push.html.haml' do view 'app/views/projects/_last_push.html.haml' do
element :create_merge_request element :create_merge_request
......
# frozen_string_literal: true
module QA module QA
module Page module Page
module Project module Project
module Wiki module Wiki
class Show < Page::Base class Show < Page::Base
include Page::Shared::ClonePanel include Page::Component::ClonePanel
view 'app/views/projects/wikis/pages.html.haml' do view 'app/views/projects/wikis/pages.html.haml' do
element :clone_repository_link, 'Clone repository' element :clone_repository_link, 'Clone repository'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment