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
Tatuya Kamada
gitlab-ce
Commits
50c2efea
Commit
50c2efea
authored
Aug 17, 2014
by
Robert Schilling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't lookup branch element - it might need to be escaped
parent
27cf081e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
3 deletions
+18
-3
app/views/projects/branches/destroy.js.haml
app/views/projects/branches/destroy.js.haml
+1
-3
features/project/commits/branches.feature
features/project/commits/branches.feature
+6
-0
features/steps/project/browse_branches.rb
features/steps/project/browse_branches.rb
+11
-0
No files found.
app/views/projects/branches/destroy.js.haml
View file @
50c2efea
:plain
$('.js-totalbranch-count').html("
#{
@repository
.
branches
.
size
}
")
$(".js-branch-
#{
@branch_name
}
").remove();
$('.js-totalbranch-count').html("
#{
@repository
.
branches
.
size
}
")
features/project/commits/branches.feature
View file @
50c2efea
...
@@ -17,3 +17,9 @@ Feature: Project Browse branches
...
@@ -17,3 +17,9 @@ Feature: Project Browse branches
And
I click new branch link
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
@javascript
Scenario
:
I
delete a branch
Given
I visit project branches page
And
I click branch 'improve/awesome' delete link
Then
I should not see branch 'improve/awesome'
features/steps/project/browse_branches.rb
View file @
50c2efea
...
@@ -43,4 +43,15 @@ class ProjectBrowseBranches < Spinach::FeatureSteps
...
@@ -43,4 +43,15 @@ class ProjectBrowseBranches < Spinach::FeatureSteps
page
.
should
have_content
'deploy_keys'
page
.
should
have_content
'deploy_keys'
end
end
end
end
step
"I click branch 'improve/awesome' delete link"
do
within
'.js-branch-improve\/awesome'
do
find
(
'.btn-remove'
).
click
sleep
0.05
end
end
step
"I should not see branch 'improve/awesome'"
do
page
.
all
(
visible:
true
).
should_not
have_content
'improve/awesome'
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