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
c617cbfc
Commit
c617cbfc
authored
Aug 12, 2016
by
Phil Hughes
Committed by
Alfredo Sumaran
Aug 13, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed filtering tests
parent
a0cd87d1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
13 deletions
+5
-13
features/steps/dashboard/event_filters.rb
features/steps/dashboard/event_filters.rb
+3
-12
features/steps/project/issues/issues.rb
features/steps/project/issues/issues.rb
+2
-1
No files found.
features/steps/dashboard/event_filters.rb
View file @
c617cbfc
...
@@ -5,38 +5,26 @@ class Spinach::Features::EventFilters < Spinach::FeatureSteps
...
@@ -5,38 +5,26 @@ class Spinach::Features::EventFilters < Spinach::FeatureSteps
include
SharedProject
include
SharedProject
step
'I should see push event'
do
step
'I should see push event'
do
wait_for_ajax
sleep
1
expect
(
page
).
to
have_selector
(
'span.pushed'
)
expect
(
page
).
to
have_selector
(
'span.pushed'
)
end
end
step
'I should not see push event'
do
step
'I should not see push event'
do
wait_for_ajax
sleep
1
expect
(
page
).
not_to
have_selector
(
'span.pushed'
)
expect
(
page
).
not_to
have_selector
(
'span.pushed'
)
end
end
step
'I should see new member event'
do
step
'I should see new member event'
do
wait_for_ajax
sleep
1
expect
(
page
).
to
have_selector
(
'span.joined'
)
expect
(
page
).
to
have_selector
(
'span.joined'
)
end
end
step
'I should not see new member event'
do
step
'I should not see new member event'
do
wait_for_ajax
sleep
1
expect
(
page
).
not_to
have_selector
(
'span.joined'
)
expect
(
page
).
not_to
have_selector
(
'span.joined'
)
end
end
step
'I should see merge request event'
do
step
'I should see merge request event'
do
wait_for_ajax
sleep
1
expect
(
page
).
to
have_selector
(
'span.accepted'
)
expect
(
page
).
to
have_selector
(
'span.accepted'
)
end
end
step
'I should not see merge request event'
do
step
'I should not see merge request event'
do
wait_for_ajax
sleep
1
expect
(
page
).
not_to
have_selector
(
'span.accepted'
)
expect
(
page
).
not_to
have_selector
(
'span.accepted'
)
end
end
...
@@ -86,13 +74,16 @@ class Spinach::Features::EventFilters < Spinach::FeatureSteps
...
@@ -86,13 +74,16 @@ class Spinach::Features::EventFilters < Spinach::FeatureSteps
When
'I click "push" event filter'
do
When
'I click "push" event filter'
do
click_link
(
"push_event_filter"
)
click_link
(
"push_event_filter"
)
sleep
1
end
end
When
'I click "team" event filter'
do
When
'I click "team" event filter'
do
click_link
(
"team_event_filter"
)
click_link
(
"team_event_filter"
)
sleep
1
end
end
When
'I click "merge" event filter'
do
When
'I click "merge" event filter'
do
click_link
(
"merged_event_filter"
)
click_link
(
"merged_event_filter"
)
sleep
1
end
end
end
end
features/steps/project/issues/issues.rb
View file @
c617cbfc
...
@@ -354,7 +354,8 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
...
@@ -354,7 +354,8 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
end
end
def
filter_issue
(
text
)
def
filter_issue
(
text
)
sleep
1
fill_in
'issue_search'
,
with:
text
fill_in
'issue_search'
,
with:
text
find
(
'#issue_search'
).
native
.
send_keys
(
:return
)
sleep
1
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