summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-26 09:52:44 +0000
committerRémy Coutable <remy@rymai.me>2016-07-26 09:52:44 +0000
commite9946f19a5af84b13fc8f21bdffa0689fd93f6c3 (patch)
tree60c62b379ebd7416c8e0b24138b0ac56c0c2d0fa
parent2e6a3b697c665006de87acc5777e6e332dee804a (diff)
parent53b6e3b8d337142ba3c9241bd2041401f82b8b01 (diff)
downloadgitlab-ce-e9946f19a5af84b13fc8f21bdffa0689fd93f6c3.tar.gz
Merge branch 'remove-branches-feature-spec-head-file' into 'master'
Remove spec/features/projects/branches_spec.rb~HEAD file ## What does this MR do? Remove unnecessary `spec/features/projects/branches_spec.rb~HEAD` file. See merge request !5489
-rw-r--r--spec/features/projects/branches_spec.rb~HEAD32
1 files changed, 0 insertions, 32 deletions
diff --git a/spec/features/projects/branches_spec.rb~HEAD b/spec/features/projects/branches_spec.rb~HEAD
deleted file mode 100644
index 79abba21854..00000000000
--- a/spec/features/projects/branches_spec.rb~HEAD
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-describe 'Branches', feature: true do
- let(:project) { create(:project) }
- let(:repository) { project.repository }
-
- before do
- login_as :user
- project.team << [@user, :developer]
- end
-
- describe 'Initial branches page' do
- it 'shows all the branches' do
- visit namespace_project_branches_path(project.namespace, project)
-
- repository.branches { |branch| expect(page).to have_content("#{branch.name}") }
- expect(page).to have_content("Protected branches can be managed in project settings")
- end
- end
-
- describe 'Find branches' do
- it 'shows filtered branches', js: true do
- visit namespace_project_branches_path(project.namespace, project, project.id)
-
- fill_in 'branch-search', with: 'fix'
- find('#branch-search').native.send_keys(:enter)
-
- expect(page).to have_content('fix')
- expect(find('.all-branches')).to have_selector('li', count: 1)
- end
- end
-end