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
098ced4f
Commit
098ced4f
authored
Jul 08, 2015
by
Stan Hu
Committed by
Robert Speicher
Jul 08, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve features to ensure Ajax filter has actually executed
parent
098ad0a5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
spec/features/issues/filter_by_milestone_spec.rb
spec/features/issues/filter_by_milestone_spec.rb
+5
-3
spec/features/merge_requests/filter_by_milestone_spec.rb
spec/features/merge_requests/filter_by_milestone_spec.rb
+5
-3
No files found.
spec/features/issues/filter_by_milestone_spec.rb
View file @
098ced4f
...
@@ -3,9 +3,12 @@ require 'rails_helper'
...
@@ -3,9 +3,12 @@ require 'rails_helper'
feature
'Issue filtering by Milestone'
,
feature:
true
do
feature
'Issue filtering by Milestone'
,
feature:
true
do
include
Select2Helper
include
Select2Helper
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:milestone
)
{
create
(
:milestone
,
project:
project
)
}
scenario
'filters by no Milestone'
,
js:
true
do
scenario
'filters by no Milestone'
,
js:
true
do
project
=
create
(
:project
,
:public
)
create
(
:issue
,
project:
project
)
create
(
:issue
,
project:
project
)
create
(
:issue
,
project:
project
,
milestone:
milestone
)
visit_issues
(
project
)
visit_issues
(
project
)
filter_by_milestone
(
Milestone
::
None
.
title
)
filter_by_milestone
(
Milestone
::
None
.
title
)
...
@@ -14,9 +17,8 @@ feature 'Issue filtering by Milestone', feature: true do
...
@@ -14,9 +17,8 @@ feature 'Issue filtering by Milestone', feature: true do
end
end
scenario
'filters by a specific Milestone'
,
js:
true
do
scenario
'filters by a specific Milestone'
,
js:
true
do
project
=
create
(
:project
,
:public
)
milestone
=
create
(
:milestone
,
project:
project
)
create
(
:issue
,
project:
project
,
milestone:
milestone
)
create
(
:issue
,
project:
project
,
milestone:
milestone
)
create
(
:issue
,
project:
project
)
visit_issues
(
project
)
visit_issues
(
project
)
filter_by_milestone
(
milestone
.
title
)
filter_by_milestone
(
milestone
.
title
)
...
...
spec/features/merge_requests/filter_by_milestone_spec.rb
View file @
098ced4f
...
@@ -3,9 +3,12 @@ require 'rails_helper'
...
@@ -3,9 +3,12 @@ require 'rails_helper'
feature
'Merge Request filtering by Milestone'
,
feature:
true
do
feature
'Merge Request filtering by Milestone'
,
feature:
true
do
include
Select2Helper
include
Select2Helper
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:milestone
)
{
create
(
:milestone
,
project:
project
)
}
scenario
'filters by no Milestone'
,
js:
true
do
scenario
'filters by no Milestone'
,
js:
true
do
project
=
create
(
:project
,
:public
)
create
(
:merge_request
,
:with_diffs
,
source_project:
project
)
create
(
:merge_request
,
:with_diffs
,
source_project:
project
)
create
(
:merge_request
,
:simple
,
source_project:
project
,
milestone:
milestone
)
visit_merge_requests
(
project
)
visit_merge_requests
(
project
)
filter_by_milestone
(
Milestone
::
None
.
title
)
filter_by_milestone
(
Milestone
::
None
.
title
)
...
@@ -14,9 +17,8 @@ feature 'Merge Request filtering by Milestone', feature: true do
...
@@ -14,9 +17,8 @@ feature 'Merge Request filtering by Milestone', feature: true do
end
end
scenario
'filters by a specific Milestone'
,
js:
true
do
scenario
'filters by a specific Milestone'
,
js:
true
do
project
=
create
(
:project
,
:public
)
milestone
=
create
(
:milestone
,
project:
project
)
create
(
:merge_request
,
:with_diffs
,
source_project:
project
,
milestone:
milestone
)
create
(
:merge_request
,
:with_diffs
,
source_project:
project
,
milestone:
milestone
)
create
(
:merge_request
,
:simple
,
source_project:
project
)
visit_merge_requests
(
project
)
visit_merge_requests
(
project
)
filter_by_milestone
(
milestone
.
title
)
filter_by_milestone
(
milestone
.
title
)
...
...
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