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
aabeb531
Commit
aabeb531
authored
Apr 11, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Approve merge request capitalisation on tests
parent
348f7e66
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/merge_request_widget/approvals/components/approvals_body.js
...rge_request_widget/approvals/components/approvals_body.js
+1
-1
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+1
-1
spec/features/merge_requests/approvals_spec.rb
spec/features/merge_requests/approvals_spec.rb
+1
-1
No files found.
app/assets/javascripts/merge_request_widget/approvals/components/approvals_body.js
View file @
aabeb531
...
...
@@ -85,7 +85,7 @@ Vue.component('approvals-body', {
:disabled='approving'
@click='approveMergeRequest'
class='btn btn-primary approve-btn'>
Approve
Merge R
equest
Approve
merge r
equest
</button>
</div>
</div>
...
...
features/steps/project/merge_requests.rb
View file @
aabeb531
...
...
@@ -611,7 +611,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step
'I click link "Approve"'
do
page
.
within
'.mr-state-widget'
do
wait_for_ajax
click_button
'Approve
Merge R
equest'
click_button
'Approve
merge r
equest'
end
end
...
...
spec/features/merge_requests/approvals_spec.rb
View file @
aabeb531
...
...
@@ -309,7 +309,7 @@ end
def
approve_merge_request
page
.
within
'.mr-state-widget'
do
click_button
'Approve
Merge R
equest'
click_button
'Approve
merge r
equest'
end
wait_for_ajax
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