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
25c1d504
Commit
25c1d504
authored
Oct 24, 2018
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rspec error text regex
parent
fdc3f847
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
...cripts/vue_merge_request_widget/stores/mr_widget_store.js
+2
-1
spec/features/merge_request/user_sees_merge_widget_spec.rb
spec/features/merge_request/user_sees_merge_widget_spec.rb
+1
-1
spec/features/merge_request/user_sees_pipelines_spec.rb
spec/features/merge_request/user_sees_pipelines_spec.rb
+2
-2
No files found.
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @
25c1d504
...
...
@@ -18,7 +18,8 @@ export default class MergeRequestStore {
this
.
squash
=
data
.
squash
;
this
.
squashBeforeMergeHelpPath
=
this
.
squashBeforeMergeHelpPath
||
data
.
squash_before_merge_help_path
;
this
.
troubleshootingDocsPath
=
data
.
troubleshooting_docs_path
;
this
.
troubleshootingDocsPath
=
this
.
troubleshootingDocsPath
||
data
.
troubleshooting_docs_path
;
this
.
enableSquashBeforeMerge
=
this
.
enableSquashBeforeMerge
||
true
;
this
.
iid
=
data
.
iid
;
...
...
spec/features/merge_request/user_sees_merge_widget_spec.rb
View file @
25c1d504
...
...
@@ -174,7 +174,7 @@ describe 'Merge request > User sees merge widget', :js do
# Wait for the `ci_status` and `merge_check` requests
wait_for_requests
expect
(
page
).
to
have_text
(
'Could not retrieve the pipeline status. For troubleshooting steps, read the <a href=\"\">documentation.</a>'
)
expect
(
page
).
to
have_text
(
%r{Could not retrieve the pipeline status
\.
For troubleshooting steps, read the <a href=
\"
.+
\"
>documentation
\.
</a>}
)
end
end
...
...
spec/features/merge_request/user_sees_pipelines_spec.rb
View file @
25c1d504
...
...
@@ -41,8 +41,8 @@ describe 'Merge request > User sees pipelines', :js do
visit
project_merge_request_path
(
project
,
merge_request
)
wait_for_requests
expect
(
page
.
find
(
'.ci-widget'
)).
to
have_
conten
t
(
'Could not retrieve the pipeline status. For potential solutions please read the documentation.'
)
expect
(
page
.
find
(
'.ci-widget'
)).
to
have_
tex
t
(
%r{Could not retrieve the pipeline status
\.
For troubleshooting steps, read the <a href=
\"
.+
\"
>documentation
\.
</a>}
)
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