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
57b523fb
Commit
57b523fb
authored
May 17, 2021
by
Erick Banks
Committed by
Sanad Liaquat
May 17, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix navigation to Advanced Search submenu in test
parent
6330a060
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
2 deletions
+17
-2
ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
.../admin/application_settings/_elasticsearch_form.html.haml
+1
-1
qa/qa/ee/page/admin/settings/component/elasticsearch.rb
qa/qa/ee/page/admin/settings/component/elasticsearch.rb
+9
-0
qa/qa/ee/resource/settings/elasticsearch.rb
qa/qa/ee/resource/settings/elasticsearch.rb
+4
-0
qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/elasticsearch_reindexing_spec.rb
...enablement/elasticsearch/elasticsearch_reindexing_spec.rb
+3
-1
No files found.
ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
View file @
57b523fb
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Advanced Search'
)
=
_
(
'Advanced Search'
)
%button
.btn.gl-button.btn-default.js-settings-toggle
{
type:
'button'
}
%button
.btn.gl-button.btn-default.js-settings-toggle
{
type:
'button'
,
data:
{
qa_selector:
'expand_advanced_search_button'
}
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
=
_
(
'Configure settings for Advanced Search with Elasticsearch.'
)
=
_
(
'Configure settings for Advanced Search with Elasticsearch.'
)
...
...
qa/qa/ee/page/admin/settings/component/elasticsearch.rb
View file @
57b523fb
...
@@ -12,12 +12,17 @@ module QA
...
@@ -12,12 +12,17 @@ module QA
element
:search_checkbox
element
:search_checkbox
element
:url_field
element
:url_field
element
:submit_button
element
:submit_button
element
:expand_advanced_search_button
end
end
def
check_indexing
def
check_indexing
check_element
(
:indexing_checkbox
)
check_element
(
:indexing_checkbox
)
end
end
def
has_no_indexing_checkbox_element?
has_no_element?
(
:indexing_checkbox
)
end
def
check_search
def
check_search
check_element
(
:search_checkbox
)
check_element
(
:search_checkbox
)
end
end
...
@@ -29,6 +34,10 @@ module QA
...
@@ -29,6 +34,10 @@ module QA
def
click_submit
def
click_submit
click_element
(
:submit_button
)
click_element
(
:submit_button
)
end
end
def
click_expand_advanced_search
click_element
(
:expand_advanced_search_button
)
end
end
end
end
end
end
end
...
...
qa/qa/ee/resource/settings/elasticsearch.rb
View file @
57b523fb
...
@@ -19,6 +19,10 @@ module QA
...
@@ -19,6 +19,10 @@ module QA
QA
::
Page
::
Main
::
Menu
.
perform
(
&
:go_to_admin_area
)
QA
::
Page
::
Main
::
Menu
.
perform
(
&
:go_to_admin_area
)
QA
::
Page
::
Admin
::
Menu
.
perform
(
&
:go_to_advanced_search
)
QA
::
Page
::
Admin
::
Menu
.
perform
(
&
:go_to_advanced_search
)
QA
::
EE
::
Page
::
Admin
::
Settings
::
Component
::
Elasticsearch
.
perform
do
|
es
|
QA
::
EE
::
Page
::
Admin
::
Settings
::
Component
::
Elasticsearch
.
perform
do
|
es
|
if
es
.
has_no_indexing_checkbox_element?
es
.
click_expand_advanced_search
end
es
.
check_indexing
if
@es_indexing
es
.
check_indexing
if
@es_indexing
es
.
check_search
if
@es_enabled
es
.
check_search
if
@es_enabled
es
.
enter_link
(
@es_url
)
es
.
enter_link
(
@es_url
)
...
...
qa/qa/specs/features/ee/browser_ui/enablement/elasticsearch/elasticsearch_reindexing_spec.rb
View file @
57b523fb
...
@@ -13,13 +13,15 @@ module QA
...
@@ -13,13 +13,15 @@ module QA
end
end
end
end
before
do
before
(
:all
)
do
Flow
::
Login
.
while_signed_in_as_admin
do
Flow
::
Login
.
while_signed_in_as_admin
do
QA
::
EE
::
Resource
::
Settings
::
Elasticsearch
.
fabricate_via_browser_ui!
QA
::
EE
::
Resource
::
Settings
::
Elasticsearch
.
fabricate_via_browser_ui!
end
end
Runtime
::
Search
.
assert_elasticsearch_responding
Runtime
::
Search
.
assert_elasticsearch_responding
end
before
do
Flow
::
Login
.
sign_in
Flow
::
Login
.
sign_in
Resource
::
Repository
::
ProjectPush
.
fabricate!
do
|
push
|
Resource
::
Repository
::
ProjectPush
.
fabricate!
do
|
push
|
...
...
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