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
965fe3b8
Commit
965fe3b8
authored
Apr 10, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix buttons copy in specs
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
5ffe05df
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
11 deletions
+11
-11
features/steps/group_hooks.rb
features/steps/group_hooks.rb
+1
-1
features/steps/project/ff_merge_requests.rb
features/steps/project/ff_merge_requests.rb
+3
-3
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+3
-3
spec/features/merge_requests/merge_with_push_rules_spec.rb
spec/features/merge_requests/merge_with_push_rules_spec.rb
+2
-2
spec/models/project_services/chat_message/merge_message_spec.rb
...odels/project_services/chat_message/merge_message_spec.rb
+2
-2
No files found.
features/steps/group_hooks.rb
View file @
965fe3b8
...
@@ -34,7 +34,7 @@ class Spinach::Features::GroupHooks < Spinach::FeatureSteps
...
@@ -34,7 +34,7 @@ class Spinach::Features::GroupHooks < Spinach::FeatureSteps
step
'I submit new hook'
do
step
'I submit new hook'
do
@url
=
'http://example.org'
@url
=
'http://example.org'
fill_in
"hook_url"
,
with:
@url
fill_in
"hook_url"
,
with:
@url
expect
{
click_button
"Add
W
ebhook"
}.
to
change
(
GroupHook
,
:count
).
by
(
1
)
expect
{
click_button
"Add
w
ebhook"
}.
to
change
(
GroupHook
,
:count
).
by
(
1
)
end
end
step
'I should see newly created hook'
do
step
'I should see newly created hook'
do
...
...
features/steps/project/ff_merge_requests.rb
View file @
965fe3b8
...
@@ -18,12 +18,12 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
...
@@ -18,12 +18,12 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
end
end
step
'merge request is mergeable'
do
step
'merge request is mergeable'
do
expect
(
page
).
to
have_button
'Accept
Merge R
equest'
expect
(
page
).
to
have_button
'Accept
merge r
equest'
end
end
step
'I should see ff-only merge button'
do
step
'I should see ff-only merge button'
do
expect
(
page
).
to
have_content
"Fast-forward merge without a merge commit"
expect
(
page
).
to
have_content
"Fast-forward merge without a merge commit"
expect
(
page
).
to
have_button
'Accept
Merge R
equest'
expect
(
page
).
to
have_button
'Accept
merge r
equest'
end
end
step
'merge request "Bug NS-05" is mergeable'
do
step
'merge request "Bug NS-05" is mergeable'
do
...
@@ -32,7 +32,7 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
...
@@ -32,7 +32,7 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
step
'I accept this merge request'
do
step
'I accept this merge request'
do
page
.
within
'.mr-state-widget'
do
page
.
within
'.mr-state-widget'
do
click_button
"Accept
Merge R
equest"
click_button
"Accept
merge r
equest"
end
end
end
end
...
...
features/steps/project/merge_requests.rb
View file @
965fe3b8
...
@@ -614,13 +614,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -614,13 +614,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step
'I should see the merge button disabled'
do
step
'I should see the merge button disabled'
do
page
.
within
'.mr-state-widget'
do
page
.
within
'.mr-state-widget'
do
expect
(
page
).
to
have_button
(
'Accept
Merge R
equest'
,
disabled:
true
)
expect
(
page
).
to
have_button
(
'Accept
merge r
equest'
,
disabled:
true
)
end
end
end
end
step
'I should not see merge button'
do
step
'I should not see merge button'
do
page
.
within
'.mr-state-widget'
do
page
.
within
'.mr-state-widget'
do
expect
(
page
).
not_to
have_button
(
'Accept
Merge R
equest'
)
expect
(
page
).
not_to
have_button
(
'Accept
merge r
equest'
)
end
end
end
end
...
@@ -632,7 +632,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -632,7 +632,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step
'I should see approved merge request "Bug NS-04"'
do
step
'I should see approved merge request "Bug NS-04"'
do
page
.
within
'.mr-state-widget'
do
page
.
within
'.mr-state-widget'
do
expect
(
page
).
to
have_button
(
'Accept
Merge R
equest'
,
disabled:
false
)
expect
(
page
).
to
have_button
(
'Accept
merge r
equest'
,
disabled:
false
)
end
end
end
end
...
...
spec/features/merge_requests/merge_with_push_rules_spec.rb
View file @
965fe3b8
...
@@ -18,7 +18,7 @@ feature 'Merge With Push Rules Validation', feature: true, js: true do
...
@@ -18,7 +18,7 @@ feature 'Merge With Push Rules Validation', feature: true, js: true do
end
end
it
'displays error message after merge request is clicked'
do
it
'displays error message after merge request is clicked'
do
click_button
'Accept
Merge R
equest'
click_button
'Accept
merge r
equest'
expect
(
page
).
to
have_content
(
'Merge in progress'
)
expect
(
page
).
to
have_content
(
'Merge in progress'
)
expect
(
page
).
to
have_content
(
'This merge request failed to be merged automatically'
)
expect
(
page
).
to
have_content
(
'This merge request failed to be merged automatically'
)
...
@@ -35,7 +35,7 @@ feature 'Merge With Push Rules Validation', feature: true, js: true do
...
@@ -35,7 +35,7 @@ feature 'Merge With Push Rules Validation', feature: true, js: true do
end
end
it
'displays error message after merge request is clicked'
do
it
'displays error message after merge request is clicked'
do
click_button
'Accept
Merge R
equest'
click_button
'Accept
merge r
equest'
expect
(
page
).
to
have_content
(
'Merge in progress'
)
expect
(
page
).
to
have_content
(
'Merge in progress'
)
expect
(
page
).
to
have_content
(
'This merge request failed to be merged automatically'
)
expect
(
page
).
to
have_content
(
'This merge request failed to be merged automatically'
)
...
...
spec/models/project_services/chat_message/merge_message_spec.rb
View file @
965fe3b8
...
@@ -57,8 +57,8 @@ describe ChatMessage::MergeMessage, models: true do
...
@@ -57,8 +57,8 @@ describe ChatMessage::MergeMessage, models: true do
it
'returns a message regarding approval of merge requests'
do
it
'returns a message regarding approval of merge requests'
do
expect
(
subject
.
pretext
).
to
eq
(
expect
(
subject
.
pretext
).
to
eq
(
'test.user approved <http://somewhere.com/merge_requests/100|
merge request !100
> '
\
'test.user approved <http://somewhere.com/merge_requests/100|
!100 *Merge Request title*
> '
\
'in <http://somewhere.com|project_name>: *
Issue
title*'
)
'in <http://somewhere.com|project_name>: *
Merge Request
title*'
)
expect
(
subject
.
attachments
).
to
be_empty
expect
(
subject
.
attachments
).
to
be_empty
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