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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
0d93e93e
Commit
0d93e93e
authored
May 14, 2016
by
Takuya Noguchi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add tests for unintentional filtering bug in MR (cf. !3872)
parent
c3acc822
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
1 deletion
+16
-1
CHANGELOG
CHANGELOG
+1
-1
spec/features/merge_requests/user_lists_merge_requests_spec.rb
...features/merge_requests/user_lists_merge_requests_spec.rb
+15
-0
No files found.
CHANGELOG
View file @
0d93e93e
...
@@ -43,7 +43,7 @@ v 8.8.0 (unreleased)
...
@@ -43,7 +43,7 @@ v 8.8.0 (unreleased)
- API support for the 'since' and 'until' operators on commit requests (Paco Guzman)
- API support for the 'since' and 'until' operators on commit requests (Paco Guzman)
- Fix Gravatar hint in user profile when Gravatar is disabled. !3988 (Artem Sidorenko)
- Fix Gravatar hint in user profile when Gravatar is disabled. !3988 (Artem Sidorenko)
- Expire repository exists? and has_visible_content? caches after a push if necessary
- Expire repository exists? and has_visible_content? caches after a push if necessary
- Fix unintentional filtering bug in
issues
sorted by milestone due (Takuya Noguchi)
- Fix unintentional filtering bug in
Issue/MR
sorted by milestone due (Takuya Noguchi)
- Fix adding a todo for private group members (Ahmad Sherif)
- Fix adding a todo for private group members (Ahmad Sherif)
- Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
- Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3
- Total method execution timings are no longer tracked
- Total method execution timings are no longer tracked
...
...
spec/features/merge_requests/user_lists_merge_requests_spec.rb
View file @
0d93e93e
...
@@ -38,6 +38,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
...
@@ -38,6 +38,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
expect
(
page
).
to
have_content
'lfs'
expect
(
page
).
to
have_content
'lfs'
expect
(
page
).
not_to
have_content
'fix'
expect
(
page
).
not_to
have_content
'fix'
expect
(
page
).
not_to
have_content
'markdown'
expect
(
page
).
not_to
have_content
'markdown'
expect
(
count_merge_requests
).
to
eq
(
1
)
end
end
it
'filters on a specific assignee'
do
it
'filters on a specific assignee'
do
...
@@ -46,6 +47,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
...
@@ -46,6 +47,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
expect
(
page
).
not_to
have_content
'lfs'
expect
(
page
).
not_to
have_content
'lfs'
expect
(
page
).
to
have_content
'fix'
expect
(
page
).
to
have_content
'fix'
expect
(
page
).
to
have_content
'markdown'
expect
(
page
).
to
have_content
'markdown'
expect
(
count_merge_requests
).
to
eq
(
2
)
end
end
it
'sorts by newest'
do
it
'sorts by newest'
do
...
@@ -53,6 +55,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
...
@@ -53,6 +55,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
expect
(
first_merge_request
).
to
include
(
'lfs'
)
expect
(
first_merge_request
).
to
include
(
'lfs'
)
expect
(
last_merge_request
).
to
include
(
'fix'
)
expect
(
last_merge_request
).
to
include
(
'fix'
)
expect
(
count_merge_requests
).
to
eq
(
3
)
end
end
it
'sorts by oldest'
do
it
'sorts by oldest'
do
...
@@ -60,30 +63,35 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
...
@@ -60,30 +63,35 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
expect
(
first_merge_request
).
to
include
(
'fix'
)
expect
(
first_merge_request
).
to
include
(
'fix'
)
expect
(
last_merge_request
).
to
include
(
'lfs'
)
expect
(
last_merge_request
).
to
include
(
'lfs'
)
expect
(
count_merge_requests
).
to
eq
(
3
)
end
end
it
'sorts by last updated'
do
it
'sorts by last updated'
do
visit_merge_requests
(
project
,
sort:
sort_value_recently_updated
)
visit_merge_requests
(
project
,
sort:
sort_value_recently_updated
)
expect
(
first_merge_request
).
to
include
(
'lfs'
)
expect
(
first_merge_request
).
to
include
(
'lfs'
)
expect
(
count_merge_requests
).
to
eq
(
3
)
end
end
it
'sorts by oldest updated'
do
it
'sorts by oldest updated'
do
visit_merge_requests
(
project
,
sort:
sort_value_oldest_updated
)
visit_merge_requests
(
project
,
sort:
sort_value_oldest_updated
)
expect
(
first_merge_request
).
to
include
(
'markdown'
)
expect
(
first_merge_request
).
to
include
(
'markdown'
)
expect
(
count_merge_requests
).
to
eq
(
3
)
end
end
it
'sorts by milestone due soon'
do
it
'sorts by milestone due soon'
do
visit_merge_requests
(
project
,
sort:
sort_value_milestone_soon
)
visit_merge_requests
(
project
,
sort:
sort_value_milestone_soon
)
expect
(
first_merge_request
).
to
include
(
'fix'
)
expect
(
first_merge_request
).
to
include
(
'fix'
)
expect
(
count_merge_requests
).
to
eq
(
3
)
end
end
it
'sorts by milestone due later'
do
it
'sorts by milestone due later'
do
visit_merge_requests
(
project
,
sort:
sort_value_milestone_later
)
visit_merge_requests
(
project
,
sort:
sort_value_milestone_later
)
expect
(
first_merge_request
).
to
include
(
'markdown'
)
expect
(
first_merge_request
).
to
include
(
'markdown'
)
expect
(
count_merge_requests
).
to
eq
(
3
)
end
end
it
'filters on one label and sorts by due soon'
do
it
'filters on one label and sorts by due soon'
do
...
@@ -94,6 +102,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
...
@@ -94,6 +102,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
sort:
sort_value_due_date_soon
)
sort:
sort_value_due_date_soon
)
expect
(
first_merge_request
).
to
include
(
'fix'
)
expect
(
first_merge_request
).
to
include
(
'fix'
)
expect
(
count_merge_requests
).
to
eq
(
1
)
end
end
context
'while filtering on two labels'
do
context
'while filtering on two labels'
do
...
@@ -110,6 +119,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
...
@@ -110,6 +119,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
sort:
sort_value_due_date_soon
)
sort:
sort_value_due_date_soon
)
expect
(
first_merge_request
).
to
include
(
'fix'
)
expect
(
first_merge_request
).
to
include
(
'fix'
)
expect
(
count_merge_requests
).
to
eq
(
1
)
end
end
context
'filter on assignee and'
do
context
'filter on assignee and'
do
...
@@ -119,6 +129,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
...
@@ -119,6 +129,7 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
sort:
sort_value_due_date_soon
)
sort:
sort_value_due_date_soon
)
expect
(
first_merge_request
).
to
include
(
'fix'
)
expect
(
first_merge_request
).
to
include
(
'fix'
)
expect
(
count_merge_requests
).
to
eq
(
1
)
end
end
end
end
end
end
...
@@ -134,4 +145,8 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
...
@@ -134,4 +145,8 @@ describe 'Projects > Merge requests > User lists merge requests', feature: true
def
last_merge_request
def
last_merge_request
page
.
all
(
'ul.mr-list > li'
).
last
.
text
page
.
all
(
'ul.mr-list > li'
).
last
.
text
end
end
def
count_merge_requests
page
.
all
(
'ul.mr-list > li'
).
count
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