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
6eb78eb5
Commit
6eb78eb5
authored
Apr 10, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a few test failures
parent
b2ec0bf8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
spec/features/issues/filtered_search/search_bar_spec.rb
spec/features/issues/filtered_search/search_bar_spec.rb
+1
-1
spec/models/project_services/chat_message/merge_message_spec.rb
...odels/project_services/chat_message/merge_message_spec.rb
+2
-2
spec/serializers/pipeline_serializer_spec.rb
spec/serializers/pipeline_serializer_spec.rb
+1
-1
No files found.
spec/features/issues/filtered_search/search_bar_spec.rb
View file @
6eb78eb5
...
...
@@ -101,7 +101,7 @@ describe 'Search bar', js: true, feature: true do
find
(
'.filtered-search-box .clear-search'
).
click
filtered_search
.
click
expect
(
find
(
'#js-dropdown-hint'
)).
to
have_selector
(
'.filter-dropdown .filter-dropdown-item'
,
count:
4
)
expect
(
find
(
'#js-dropdown-hint'
)).
to
have_selector
(
'.filter-dropdown .filter-dropdown-item'
,
count:
5
)
expect
(
get_left_style
(
find
(
'#js-dropdown-hint'
)[
'style'
])).
to
eq
(
hint_offset
)
end
end
...
...
spec/models/project_services/chat_message/merge_message_spec.rb
View file @
6eb78eb5
...
...
@@ -57,8 +57,8 @@ describe ChatMessage::MergeMessage, models: true do
it
'returns a message regarding approval of merge requests'
do
expect
(
subject
.
pretext
).
to
eq
(
'test.user approved <http://somewhere.com/merge_requests/100|
merge request !100
> '
\
'in <http://somewhere.com|project_name>: *
Issue
title*'
)
'test.user approved <http://somewhere.com/merge_requests/100|
!100 *Merge Request title*
> '
\
'in <http://somewhere.com|project_name>: *
Merge Request
title*'
)
expect
(
subject
.
attachments
).
to
be_empty
end
end
...
...
spec/serializers/pipeline_serializer_spec.rb
View file @
6eb78eb5
...
...
@@ -113,7 +113,7 @@ describe PipelineSerializer do
it
"verifies number of queries"
do
recorded
=
ActiveRecord
::
QueryRecorder
.
new
{
subject
}
expect
(
recorded
.
count
).
to
be_within
(
1
).
of
(
5
0
)
expect
(
recorded
.
count
).
to
be_within
(
1
).
of
(
5
3
)
expect
(
recorded
.
cached_count
).
to
eq
(
0
)
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