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
504a104a
Commit
504a104a
authored
Apr 06, 2020
by
Anastasia McDonald
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improvements to make review_merge_request_spec more reliable
Wait for animated element added
parent
8127a62d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
qa/qa/page/project/web_ide/edit.rb
qa/qa/page/project/web_ide/edit.rb
+2
-0
qa/qa/specs/features/browser_ui/3_create/web_ide/review_merge_request_spec.rb
.../browser_ui/3_create/web_ide/review_merge_request_spec.rb
+2
-1
No files found.
qa/qa/page/project/web_ide/edit.rb
View file @
504a104a
...
@@ -120,10 +120,12 @@ module QA
...
@@ -120,10 +120,12 @@ module QA
def
add_to_modified_content
(
content
)
def
add_to_modified_content
(
content
)
finished_loading?
finished_loading?
modified_text_area
.
click
modified_text_area
.
set
content
modified_text_area
.
set
content
end
end
def
modified_text_area
def
modified_text_area
wait_for_animated_element
(
:editor_container
)
within_element
(
:editor_container
)
do
within_element
(
:editor_container
)
do
find
(
'.modified textarea.inputarea'
)
find
(
'.modified textarea.inputarea'
)
end
end
...
...
qa/qa/specs/features/browser_ui/3_create/web_ide/review_merge_request_spec.rb
View file @
504a104a
...
@@ -4,12 +4,13 @@ module QA
...
@@ -4,12 +4,13 @@ module QA
context
'Create'
,
quarantine:
{
type: :new
}
do
context
'Create'
,
quarantine:
{
type: :new
}
do
describe
'Review a merge request in Web IDE'
do
describe
'Review a merge request in Web IDE'
do
let
(
:new_file
)
{
'awesome_new_file.txt'
}
let
(
:new_file
)
{
'awesome_new_file.txt'
}
let
(
:original_text
)
{
'Text'
}
let
(
:review_text
)
{
'Reviewed '
}
let
(
:review_text
)
{
'Reviewed '
}
let
(
:merge_request
)
do
let
(
:merge_request
)
do
Resource
::
MergeRequest
.
fabricate_via_api!
do
|
mr
|
Resource
::
MergeRequest
.
fabricate_via_api!
do
|
mr
|
mr
.
file_name
=
new_file
mr
.
file_name
=
new_file
mr
.
file_content
=
'Text'
mr
.
file_content
=
original_text
end
end
end
end
...
...
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