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
a825dc22
Commit
a825dc22
authored
Jul 11, 2018
by
ddavison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move #has_milestone? to issuable sidebar;
closes #48690
parent
a781d0f9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
11 deletions
+13
-11
qa/qa/page/issuable/sidebar.rb
qa/qa/page/issuable/sidebar.rb
+7
-0
qa/qa/page/merge_request/show.rb
qa/qa/page/merge_request/show.rb
+0
-6
qa/qa/specs/features/merge_request/create_spec.rb
qa/qa/specs/features/merge_request/create_spec.rb
+6
-5
No files found.
qa/qa/page/issuable/sidebar.rb
View file @
a825dc22
...
...
@@ -4,6 +4,7 @@ module QA
class
Sidebar
<
Page
::
Base
view
'app/views/shared/issuable/_sidebar.html.haml'
do
element
:labels_block
,
".issuable-show-labels"
element
:milestones_block
,
'.block.milestone'
end
def
has_label?
(
label
)
...
...
@@ -11,6 +12,12 @@ module QA
!!
find
(
'span'
,
text:
label
)
end
end
def
has_milestone?
(
milestone
)
page
.
within
(
'.block.milestone'
)
do
!!
find
(
"[href*='/milestones/']"
,
text:
milestone
)
end
end
end
end
end
...
...
qa/qa/page/merge_request/show.rb
View file @
a825dc22
...
...
@@ -79,12 +79,6 @@ module QA
click_element
:squash_checkbox
end
def
has_milestone?
(
milestone_title
)
page
.
within
(
'.issuable-sidebar'
)
do
!!
find
(
"[href*='/milestones/']"
,
text:
milestone_title
,
wait:
1
)
end
end
end
end
end
...
...
qa/qa/specs/features/merge_request/create_spec.rb
View file @
a825dc22
...
...
@@ -20,11 +20,12 @@ module QA
merge_request
.
milestone
=
current_milestone
end
Page
::
MergeRequest
::
Show
.
perform
do
|
merge_request
|
expect
(
page
).
to
have_content
(
'This is a merge request with a milestone'
)
expect
(
page
).
to
have_content
(
'Great feature with milestone'
)
expect
(
page
).
to
have_content
(
/Opened [\w\s]+ ago/
)
expect
(
merge_request
).
to
have_milestone
(
current_milestone
.
title
)
expect
(
page
).
to
have_content
(
'This is a merge request with a milestone'
)
expect
(
page
).
to
have_content
(
'Great feature with milestone'
)
expect
(
page
).
to
have_content
(
/Opened [\w\s]+ ago/
)
Page
::
Issuable
::
Sidebar
.
perform
do
|
sidebar
|
expect
(
sidebar
).
to
have_milestone
(
current_milestone
.
title
)
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