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
This commit is contained in:
Rémy Coutable 2016-07-26 09:52:44 +00:00
commit e9946f19a5
1 changed files with 0 additions and 32 deletions

View File

@ -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