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
2e3b1b28
Commit
2e3b1b28
authored
Jun 25, 2019
by
Michel Engelen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated specs for features
parent
4f0b6a7a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
ee/spec/features/discussion_comments/epic_spec.rb
ee/spec/features/discussion_comments/epic_spec.rb
+2
-2
ee/spec/features/epics/epic_show.rb
ee/spec/features/epics/epic_show.rb
+2
-2
ee/spec/features/merge_request/user_approves_spec.rb
ee/spec/features/merge_request/user_approves_spec.rb
+1
-1
ee/spec/features/merge_request/user_sees_approval_widget_spec.rb
.../features/merge_request/user_sees_approval_widget_spec.rb
+1
-1
No files found.
ee/spec/features/discussion_comments/epic_spec.rb
View file @
2e3b1b28
require
'spec_helper'
describe
'
Discussion
Comments Epic'
,
:js
do
describe
'
Thread
Comments Epic'
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:epic
)
{
create
(
:epic
)
}
...
...
@@ -12,5 +12,5 @@ describe 'Discussion Comments Epic', :js do
visit
group_epic_path
(
epic
.
group
,
epic
)
end
it_behaves_like
'
discussion
comments'
,
'epic'
it_behaves_like
'
thread
comments'
,
'epic'
end
ee/spec/features/epics/epic_show.rb
View file @
2e3b1b28
...
...
@@ -54,7 +54,7 @@ describe 'Epic show', :js do
end
end
it
'shows epic
discussion
filter dropdown'
do
it
'shows epic
thread
filter dropdown'
do
page
.
within
(
'.js-epic-tabs-container'
)
do
expect
(
find
(
'.js-discussion-filter-container #discussion-filter-dropdown'
)).
to
have_content
(
'Show all activity'
)
end
...
...
@@ -97,7 +97,7 @@ describe 'Epic show', :js do
end
end
it
'does not show
discussion
filter dropdown'
do
it
'does not show
thread
filter dropdown'
do
expect
(
find
(
'.js-epic-tabs-container'
)).
to
have_selector
(
'.js-discussion-filter-container'
,
visible:
false
)
end
...
...
ee/spec/features/merge_request/user_approves_spec.rb
View file @
2e3b1b28
...
...
@@ -80,7 +80,7 @@ xdescribe 'Merge request > User approves', :js do
end
end
context
'when merge when
discussion
s resolved is active'
do
context
'when merge when
thread
s resolved is active'
do
let
(
:project
)
do
create
(
:project
,
:repository
,
approvals_before_merge:
1
,
...
...
ee/spec/features/merge_request/user_sees_approval_widget_spec.rb
View file @
2e3b1b28
...
...
@@ -9,7 +9,7 @@ describe 'Merge request > User sees approval widget', :js do
sign_in
(
user
)
end
context
'when merge when
discussion
s resolved is active'
do
context
'when merge when
thread
s resolved is active'
do
let
(
:project
)
do
create
(
:project
,
:repository
,
approvals_before_merge:
1
,
...
...
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