diff options
author | Robert Speicher <robert@gitlab.com> | 2018-03-19 22:15:00 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-03-19 22:15:00 +0000 |
commit | 14d18a125e4763bdba2248cfa08913bd26689674 (patch) | |
tree | 60b14206a045706dbaafb0566927dc320e66fad1 /spec/features | |
parent | 709f4d1226c98810073fd6f8f1e6fc6a579d3da1 (diff) | |
parent | 35f4c261d84a35a1223c2fd7d372e0bfcd18194c (diff) | |
download | gitlab-ce-14d18a125e4763bdba2248cfa08913bd26689674.tar.gz |
Merge branch '10-6-stable-prepare-rc7' into '10-6-stable'
Prepare 10.6-rc7
See merge request gitlab/gitlabhq!2362
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/ci_lint_spec.rb | 1 | ||||
-rw-r--r-- | spec/features/profiles/user_visits_notifications_tab_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/pipelines/pipelines_spec.rb | 12 | ||||
-rw-r--r-- | spec/features/projects/show_project_spec.rb | 22 |
4 files changed, 36 insertions, 1 deletions
diff --git a/spec/features/ci_lint_spec.rb b/spec/features/ci_lint_spec.rb index b1dceec9da8..220b934154e 100644 --- a/spec/features/ci_lint_spec.rb +++ b/spec/features/ci_lint_spec.rb @@ -39,6 +39,7 @@ describe 'CI Lint', :js do it 'displays information about an error' do expect(page).to have_content('Status: syntax is incorrect') + expect(page).to have_selector('.ace_content', text: yaml_content) end end diff --git a/spec/features/profiles/user_visits_notifications_tab_spec.rb b/spec/features/profiles/user_visits_notifications_tab_spec.rb index 1952fdae798..95953fbcfac 100644 --- a/spec/features/profiles/user_visits_notifications_tab_spec.rb +++ b/spec/features/profiles/user_visits_notifications_tab_spec.rb @@ -16,6 +16,6 @@ feature 'User visits the notifications tab', :js do first('#notifications-button').click click_link('On mention') - expect(page).to have_content('On mention') + expect(page).to have_selector('#notifications-button', text: 'On mention') end end diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb index 849d85061df..09b6cc4dbf5 100644 --- a/spec/features/projects/pipelines/pipelines_spec.rb +++ b/spec/features/projects/pipelines/pipelines_spec.rb @@ -349,6 +349,18 @@ describe 'Pipelines', :js do it { expect(page).not_to have_selector('.build-artifacts') } end + + context 'with trace artifact' do + before do + create(:ci_build, :success, :trace_artifact, pipeline: pipeline) + + visit_project_pipelines + end + + it 'does not show trace artifact as artifacts' do + expect(page).not_to have_selector('.build-artifacts') + end + end end context 'mini pipeline graph' do diff --git a/spec/features/projects/show_project_spec.rb b/spec/features/projects/show_project_spec.rb index 0a014e9f080..e4f13e6cab7 100644 --- a/spec/features/projects/show_project_spec.rb +++ b/spec/features/projects/show_project_spec.rb @@ -1,6 +1,8 @@ require 'spec_helper' describe 'Project show page', :feature do + include DropzoneHelper + context 'when project pending delete' do let(:project) { create(:project, :empty_repo, pending_delete: true) } @@ -334,4 +336,24 @@ describe 'Project show page', :feature do end end end + + describe 'dropzone', :js do + let(:project) { create(:project, :repository) } + let(:user) { create(:user) } + + before do + project.add_master(user) + sign_in(user) + + visit project_path(project) + end + + it 'can upload files' do + find('.add-to-tree').click + click_link 'Upload file' + drop_in_dropzone(File.join(Rails.root, 'spec', 'fixtures', 'doc_sample.txt')) + + expect(find('.dz-filename')).to have_content('doc_sample.txt') + end + end end |