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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
5a1429ae
Commit
5a1429ae
authored
May 24, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix branches tests
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
1bb9aeb5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
12 deletions
+8
-12
features/project/commits/branches.feature
features/project/commits/branches.feature
+4
-7
features/steps/project/browse_branches.rb
features/steps/project/browse_branches.rb
+0
-5
features/steps/shared/paths.rb
features/steps/shared/paths.rb
+4
-0
No files found.
features/project/commits/branches.feature
View file @
5a1429ae
...
@@ -3,20 +3,17 @@ Feature: Project Browse branches
...
@@ -3,20 +3,17 @@ Feature: Project Browse branches
Given
I sign in as a user
Given
I sign in as a user
And
I own project
"Shop"
And
I own project
"Shop"
And
project
"Shop"
has protected branches
And
project
"Shop"
has protected branches
Given
I visit project branches page
Scenario
:
I
can see project recent git branches
Then
I should see
"Shop"
recent branches list
Scenario
:
I
can see project all git branches
Scenario
:
I
can see project all git branches
Given
I
click link
"All"
Given
I
visit project branches page
Then
I should see
"Shop"
all branches list
Then
I should see
"Shop"
all branches list
Scenario
:
I
can see project protected git branches
Scenario
:
I
can see project protected git branches
Given
I
click link
"Protected"
Given
I
visit project protected branches page
Then
I should see
"Shop"
protected branches list
Then
I should see
"Shop"
protected branches list
Scenario
:
I
create a branch
Scenario
:
I
create a branch
Given
I click new branch link
Given
I visit project branches page
And
I click new branch link
When
I submit new branch form
When
I submit new branch form
Then
I should see new branch created
Then
I should see new branch created
features/steps/project/browse_branches.rb
View file @
5a1429ae
...
@@ -3,11 +3,6 @@ class ProjectBrowseBranches < Spinach::FeatureSteps
...
@@ -3,11 +3,6 @@ class ProjectBrowseBranches < Spinach::FeatureSteps
include
SharedProject
include
SharedProject
include
SharedPaths
include
SharedPaths
step
'I should see "Shop" recent branches list'
do
page
.
should
have_content
"Branches"
page
.
should
have_content
"master"
end
step
'I click link "All"'
do
step
'I click link "All"'
do
click_link
"All"
click_link
"All"
end
end
...
...
features/steps/shared/paths.rb
View file @
5a1429ae
...
@@ -240,6 +240,10 @@ module SharedPaths
...
@@ -240,6 +240,10 @@ module SharedPaths
visit
project_branches_path
(
@project
)
visit
project_branches_path
(
@project
)
end
end
step
'I visit project protected branches page'
do
visit
project_protected_branches_path
(
@project
)
end
step
'I visit compare refs page'
do
step
'I visit compare refs page'
do
visit
project_compare_index_path
(
@project
)
visit
project_compare_index_path
(
@project
)
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