BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
dc3d778f
Unverified
Commit
dc3d778f
authored
Apr 30, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix failing specs
parent
759f102d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
cherry_pick_spec.rb
spec/features/projects/commit/cherry_pick_spec.rb
+1
-1
environment_spec.rb
spec/features/projects/environments/environment_spec.rb
+1
-1
merge_request_button_spec.rb
spec/features/projects/merge_request_button_spec.rb
+6
-6
No files found.
spec/features/projects/commit/cherry_pick_spec.rb
View file @
dc3d778f
...
...
@@ -75,7 +75,7 @@ describe 'Cherry-pick Commits' do
wait_for_ajax
page
.
within
(
'#modal-cherry-pick-commit .dropdown-menu .dropdown-content'
)
do
click_link
'feature'
click_link
"'test'"
end
page
.
within
(
'#modal-cherry-pick-commit'
)
do
...
...
spec/features/projects/environments/environment_spec.rb
View file @
dc3d778f
...
...
@@ -200,7 +200,7 @@ feature 'Environment', :feature do
end
scenario
'user deletes the branch with running environment'
do
visit
namespace_project_branches_path
(
project
.
namespace
,
project
)
visit
namespace_project_branches_path
(
project
.
namespace
,
project
,
page:
2
)
remove_branch_with_hooks
(
project
,
user
,
'feature'
)
do
page
.
within
(
'.js-branch-feature'
)
{
find
(
'a.btn-remove'
).
click
}
...
...
spec/features/projects/merge_request_button_spec.rb
View file @
dc3d778f
...
...
@@ -25,7 +25,7 @@ feature 'Merge Request button', feature: true do
it
'shows Create merge request button'
do
href
=
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request:
{
source_branch:
'feature'
,
merge_request:
{
source_branch:
"'test'"
,
target_branch:
'master'
})
visit
url
...
...
@@ -69,7 +69,7 @@ feature 'Merge Request button', feature: true do
it
'shows Create merge request button'
do
href
=
new_namespace_project_merge_request_path
(
forked_project
.
namespace
,
forked_project
,
merge_request:
{
source_branch:
'feature'
,
merge_request:
{
source_branch:
"'test'"
,
target_branch:
'master'
})
visit
fork_url
...
...
@@ -93,16 +93,16 @@ feature 'Merge Request button', feature: true do
context
'on compare page'
do
it_behaves_like
'Merge request button only shown when allowed'
do
let
(
:label
)
{
'Create merge request'
}
let
(
:url
)
{
namespace_project_compare_path
(
project
.
namespace
,
project
,
from:
'master'
,
to:
'feature'
)
}
let
(
:fork_url
)
{
namespace_project_compare_path
(
forked_project
.
namespace
,
forked_project
,
from:
'master'
,
to:
'feature'
)
}
let
(
:url
)
{
namespace_project_compare_path
(
project
.
namespace
,
project
,
from:
'master'
,
to:
"'test'"
)
}
let
(
:fork_url
)
{
namespace_project_compare_path
(
forked_project
.
namespace
,
forked_project
,
from:
'master'
,
to:
"'test'"
)
}
end
end
context
'on commits page'
do
it_behaves_like
'Merge request button only shown when allowed'
do
let
(
:label
)
{
'Create merge request'
}
let
(
:url
)
{
namespace_project_commits_path
(
project
.
namespace
,
project
,
'feature'
)
}
let
(
:fork_url
)
{
namespace_project_commits_path
(
forked_project
.
namespace
,
forked_project
,
'feature'
)
}
let
(
:url
)
{
namespace_project_commits_path
(
project
.
namespace
,
project
,
"'test'"
)
}
let
(
:fork_url
)
{
namespace_project_commits_path
(
forked_project
.
namespace
,
forked_project
,
"'test'"
)
}
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