Commit 8acbc9e0 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Merge remote-tracking branch 'origin/master' into improve-pipeline-processing

parents 1984697b d4f987b2
...@@ -104,7 +104,7 @@ v 8.11.0 (unreleased) ...@@ -104,7 +104,7 @@ v 8.11.0 (unreleased)
- Fix importing GitLab projects with an invalid MR source project - Fix importing GitLab projects with an invalid MR source project
- Sort folders with submodules in Files view !5521 - Sort folders with submodules in Files view !5521
- Each `File::exists?` replaced to `File::exist?` because of deprecate since ruby version 2.2.0 - Each `File::exists?` replaced to `File::exist?` because of deprecate since ruby version 2.2.0
- Print urls to create (or view) merge requests after git push !5542 (Scott Le) - Add auto-completition in pipeline (Katarzyna Kobierska Ula Budziszewska)
v 8.10.5 v 8.10.5
- Add a data migration to fix some missing timestamps in the members table. !5670 - Add a data migration to fix some missing timestamps in the members table. !5670
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
.form-group .form-group
= f.label :ref, 'Create for', class: 'control-label' = f.label :ref, 'Create for', class: 'control-label'
.col-sm-10 .col-sm-10
= f.text_field :ref, required: true, tabindex: 2, class: 'form-control' = f.text_field :ref, required: true, tabindex: 2, class: 'form-control js-branch-name ui-autocomplete-input', autocomplete: :false, id: :ref
.help-block Existing branch name, tag .help-block Existing branch name, tag
.form-actions .form-actions
= f.submit 'Create pipeline', class: 'btn btn-create', tabindex: 3 = f.submit 'Create pipeline', class: 'btn btn-create', tabindex: 3
......
...@@ -205,7 +205,7 @@ describe "Pipelines" do ...@@ -205,7 +205,7 @@ describe "Pipelines" do
before { visit new_namespace_project_pipeline_path(project.namespace, project) } before { visit new_namespace_project_pipeline_path(project.namespace, project) }
context 'for valid commit' do context 'for valid commit' do
before { fill_in('Create for', with: 'master') } before { fill_in('pipeline[ref]', with: 'master') }
context 'with gitlab-ci.yml' do context 'with gitlab-ci.yml' do
before { stub_ci_pipeline_to_return_yaml_file } before { stub_ci_pipeline_to_return_yaml_file }
...@@ -222,11 +222,37 @@ describe "Pipelines" do ...@@ -222,11 +222,37 @@ describe "Pipelines" do
context 'for invalid commit' do context 'for invalid commit' do
before do before do
fill_in('Create for', with: 'invalid-reference') fill_in('pipeline[ref]', with: 'invalid-reference')
click_on 'Create pipeline' click_on 'Create pipeline'
end end
it { expect(page).to have_content('Reference not found') } it { expect(page).to have_content('Reference not found') }
end end
end end
describe 'Create pipelines', feature: true do
let(:project) { create(:project) }
before do
visit new_namespace_project_pipeline_path(project.namespace, project)
end
describe 'new pipeline page' do
it 'has field to add a new pipeline' do
expect(page).to have_field('pipeline[ref]')
expect(page).to have_content('Create for')
end
end
describe 'find pipelines' do
it 'shows filtered pipelines', js: true do
fill_in('pipeline[ref]', with: 'fix')
find('input#ref').native.send_keys(:keydown)
within('.ui-autocomplete') do
expect(page).to have_selector('li', text: 'fix')
end
end
end
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment