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
6f29026f
Commit
6f29026f
authored
Sep 01, 2017
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix failures introduced by Capybara upgrade
parent
ecb879f6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
8 deletions
+9
-8
spec/features/dashboard/projects_spec.rb
spec/features/dashboard/projects_spec.rb
+3
-3
spec/features/merge_requests/diff_notes_resolve_spec.rb
spec/features/merge_requests/diff_notes_resolve_spec.rb
+3
-2
spec/features/projects/files/creating_a_file_spec.rb
spec/features/projects/files/creating_a_file_spec.rb
+1
-1
spec/features/search_spec.rb
spec/features/search_spec.rb
+2
-2
No files found.
spec/features/dashboard/projects_spec.rb
View file @
6f29026f
...
...
@@ -115,9 +115,9 @@ feature 'Dashboard Projects' do
expect
(
page
).
to
have_selector
(
'.merge-request-form'
)
expect
(
current_path
).
to
eq
project_new_merge_request_path
(
project
)
expect
(
find
(
'#merge_request_target_project_id'
).
value
).
to
eq
project
.
id
.
to_s
expect
(
find
(
'input#merge_request_source_branch'
).
value
).
to
eq
'feature'
expect
(
find
(
'input#merge_request_target_branch'
).
value
).
to
eq
'master'
expect
(
find
(
'#merge_request_target_project_id'
,
visible:
false
).
value
).
to
eq
project
.
id
.
to_s
expect
(
find
(
'input#merge_request_source_branch'
,
visible:
false
).
value
).
to
eq
'feature'
expect
(
find
(
'input#merge_request_target_branch'
,
visible:
false
).
value
).
to
eq
'master'
end
end
end
spec/features/merge_requests/diff_notes_resolve_spec.rb
View file @
6f29026f
...
...
@@ -196,10 +196,11 @@ feature 'Diff notes resolve', js: true do
end
it
'does not mark discussion as resolved when resolving single note'
do
page
.
first
'.diff-content .note'
do
page
.
within
(
"#note_
#{
note
.
id
}
"
)
do
first
(
'.line-resolve-btn'
).
click
expect
(
page
).
to
have_selector
(
'.note-action-button .loading'
)
wait_for_requests
expect
(
first
(
'.line-resolve-btn'
)[
'data-original-title'
]).
to
eq
(
"Resolved by
#{
user
.
name
}
"
)
end
...
...
spec/features/projects/files/creating_a_file_spec.rb
View file @
6f29026f
...
...
@@ -14,7 +14,7 @@ feature 'User wants to create a file' do
file_name
=
find
(
'#file_name'
)
file_name
.
set
options
[
:file_name
]
||
'README.md'
file_content
=
find
(
'#file-content'
)
file_content
=
find
(
'#file-content'
,
visible:
false
)
file_content
.
set
options
[
:file_content
]
||
'Some content'
click_button
'Commit changes'
...
...
spec/features/search_spec.rb
View file @
6f29026f
...
...
@@ -295,7 +295,7 @@ describe "Search" do
fill_in
'search'
,
with:
'foo'
click_button
'Search'
expect
(
find
(
'#group_id'
).
value
).
to
eq
(
project
.
namespace
.
id
.
to_s
)
expect
(
find
(
'#group_id'
,
visible:
false
).
value
).
to
eq
(
project
.
namespace
.
id
.
to_s
)
end
it
'preserves the project being searched in'
do
...
...
@@ -304,7 +304,7 @@ describe "Search" do
fill_in
'search'
,
with:
'foo'
click_button
'Search'
expect
(
find
(
'#project_id'
).
value
).
to
eq
(
project
.
id
.
to_s
)
expect
(
find
(
'#project_id'
,
visible:
false
).
value
).
to
eq
(
project
.
id
.
to_s
)
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