Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
08e21103
Commit
08e21103
authored
Aug 14, 2019
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce the CE/EE diff under qa/
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
a49e31b3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
42 additions
and
16 deletions
+42
-16
qa/qa/ee.rb
qa/qa/ee.rb
+4
-0
qa/qa/ee/scenario/test/sanity/selectors.rb
qa/qa/ee/scenario/test/sanity/selectors.rb
+17
-0
qa/qa/page/project/issue/new.rb
qa/qa/page/project/issue/new.rb
+4
-4
qa/qa/page/project/issue/show.rb
qa/qa/page/project/issue/show.rb
+8
-7
qa/qa/page/project/menu.rb
qa/qa/page/project/menu.rb
+2
-2
qa/qa/scenario/test/sanity/selectors.rb
qa/qa/scenario/test/sanity/selectors.rb
+7
-3
No files found.
qa/qa/ee.rb
View file @
08e21103
...
...
@@ -137,6 +137,10 @@ module QA
autoload
:GroupSAML
,
'qa/ee/scenario/test/integration/group_saml'
autoload
:Elasticsearch
,
'qa/ee/scenario/test/integration/elasticsearch'
end
module
Sanity
autoload
:Selectors
,
'qa/ee/scenario/test/sanity/selectors'
end
end
end
end
...
...
qa/qa/ee/scenario/test/sanity/selectors.rb
0 → 100644
View file @
08e21103
# frozen_string_literal: true
module
QA
module
EE
module
Scenario
module
Test
module
Sanity
module
Selectors
def
pages
@ee_pages
||=
super
+
[
QA
::
EE
::
Page
]
end
end
end
end
end
end
end
qa/qa/page/project/issue/new.rb
View file @
08e21103
...
...
@@ -5,10 +5,6 @@ module QA
module
Project
module
Issue
class
New
<
Page
::
Base
view
'app/views/shared/form_elements/_description.html.haml'
do
element
:issue_description_textarea
,
"render 'projects/zen', f: form, attr: :description"
# rubocop:disable QA/ElementWithPattern
end
view
'app/views/shared/issuable/_form.html.haml'
do
element
:issuable_create_button
end
...
...
@@ -17,6 +13,10 @@ module QA
element
:issue_title_textbox
,
'form.text_field :title'
# rubocop:disable QA/ElementWithPattern
end
view
'app/views/shared/form_elements/_description.html.haml'
do
element
:issue_description_textarea
,
"render 'projects/zen', f: form, attr: :description"
# rubocop:disable QA/ElementWithPattern
end
def
add_title
(
title
)
fill_in
'issue_title'
,
with:
title
end
...
...
qa/qa/page/project/issue/show.rb
View file @
08e21103
...
...
@@ -5,7 +5,6 @@ module QA
module
Project
module
Issue
class
Show
<
Page
::
Base
prepend
QA
::
EE
::
Page
::
Project
::
Issue
::
Show
include
Page
::
Component
::
Issuable
::
Common
include
Page
::
Component
::
Note
...
...
@@ -27,17 +26,17 @@ module QA
element
:dropdown_input_field
end
view
'app/views/shared/issuable/_sidebar.html.haml'
do
element
:dropdown_menu_labels
element
:edit_link_labels
element
:labels_block
end
view
'app/views/shared/notes/_form.html.haml'
do
element
:new_note_form
,
'new-note'
# rubocop:disable QA/ElementWithPattern
element
:new_note_form
,
'attr: :note'
# rubocop:disable QA/ElementWithPattern
end
view
'app/views/shared/issuable/_sidebar.html.haml'
do
element
:labels_block
element
:edit_link_labels
element
:dropdown_menu_labels
end
# Adds a comment to an issue
# attachment option should be an absolute path
def
comment
(
text
,
attachment:
nil
,
filter: :all_activities
)
...
...
@@ -109,3 +108,5 @@ module QA
end
end
end
QA
::
Page
::
Project
::
Issue
::
Show
.
prepend
(
QA
::
EE
::
Page
::
Project
::
Issue
::
Show
)
qa/qa/page/project/menu.rb
View file @
08e21103
...
...
@@ -5,14 +5,12 @@ module QA
module
Project
class
Menu
<
Page
::
Base
include
SubMenus
::
Common
include
SubMenus
::
Project
include
SubMenus
::
CiCd
include
SubMenus
::
Issues
include
SubMenus
::
Operations
include
SubMenus
::
Repository
include
SubMenus
::
Settings
include
EE
::
Page
::
Project
::
SubMenus
::
SecurityCompliance
# rubocop: disable Cop/InjectEnterpriseEditionModule
view
'app/views/layouts/nav/sidebar/_project.html.haml'
do
element
:activity_link
...
...
@@ -41,3 +39,5 @@ module QA
end
end
end
QA
::
Page
::
Project
::
Menu
.
prepend
(
QA
::
EE
::
Page
::
Project
::
SubMenus
::
SecurityCompliance
)
qa/qa/scenario/test/sanity/selectors.rb
View file @
08e21103
...
...
@@ -7,11 +7,13 @@ module QA
class
Selectors
<
Scenario
::
Template
include
Scenario
::
Bootable
PAGES
=
[
QA
::
Page
,
QA
::
EE
::
Page
].
freeze
def
pages
@pages
||=
[
QA
::
Page
]
end
def
perform
(
*
)
validators
=
PAGES
.
map
do
|
pages
|
Page
::
Validator
.
new
(
page
s
)
validators
=
pages
.
map
do
|
page
|
Page
::
Validator
.
new
(
page
)
end
validators
.
flat_map
(
&
:errors
).
tap
do
|
errors
|
...
...
@@ -54,3 +56,5 @@ module QA
end
end
end
QA
::
Scenario
::
Test
::
Sanity
::
Selectors
.
prepend
(
QA
::
EE
::
Scenario
::
Test
::
Sanity
::
Selectors
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment