diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 21:09:05 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 21:09:05 +0300 |
commit | c2367afbf57ebc65d5b78a743b5d6a91f0aece9f (patch) | |
tree | 165c2c54bf72ab3a3a9417d97f63ece5c9eba9f5 /spec/features | |
parent | 51a9512965d86e3094968fa514e4ae8a96d38cf3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/projects/navbar_spec.rb | 1 | ||||
-rw-r--r-- | spec/features/projects/pipelines/pipeline_spec.rb | 6 | ||||
-rw-r--r-- | spec/features/projects/services/user_views_services_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/settings/operations_settings_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/settings/webhooks_settings_spec.rb (renamed from spec/features/projects/settings/integration_settings_spec.rb) | 21 |
5 files changed, 17 insertions, 15 deletions
diff --git a/spec/features/projects/navbar_spec.rb b/spec/features/projects/navbar_spec.rb index 4ab6b0ce506..95a8f974261 100644 --- a/spec/features/projects/navbar_spec.rb +++ b/spec/features/projects/navbar_spec.rb @@ -88,6 +88,7 @@ describe 'Project navbar' do _('General'), _('Members'), _('Integrations'), + _('Webhooks'), _('Repository'), _('CI / CD'), _('Operations'), diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb index 63c0695fe95..1c72c54f0a1 100644 --- a/spec/features/projects/pipelines/pipeline_spec.rb +++ b/spec/features/projects/pipelines/pipeline_spec.rb @@ -1077,8 +1077,6 @@ describe 'Pipeline', :js do end context 'when pipeline has configuration errors' do - include_context 'pipeline builds' - let(:pipeline) do create(:ci_pipeline, :invalid, @@ -1119,6 +1117,10 @@ describe 'Pipeline', :js do %Q{span[title="#{pipeline.present.failure_reason}"]}) end end + + it 'contains a pipeline header with title' do + expect(page).to have_content "Pipeline ##{pipeline.id}" + end end context 'when pipeline is stuck' do diff --git a/spec/features/projects/services/user_views_services_spec.rb b/spec/features/projects/services/user_views_services_spec.rb index d9358a40602..cf403a131b0 100644 --- a/spec/features/projects/services/user_views_services_spec.rb +++ b/spec/features/projects/services/user_views_services_spec.rb @@ -14,7 +14,7 @@ describe 'User views services' do end it 'shows the list of available services' do - expect(page).to have_content('Project services') + expect(page).to have_content('Integrations') expect(page).to have_content('Campfire') expect(page).to have_content('HipChat') expect(page).to have_content('Assembla') diff --git a/spec/features/projects/settings/operations_settings_spec.rb b/spec/features/projects/settings/operations_settings_spec.rb index d57401471ff..3c9102431e8 100644 --- a/spec/features/projects/settings/operations_settings_spec.rb +++ b/spec/features/projects/settings/operations_settings_spec.rb @@ -35,7 +35,7 @@ describe 'Projects > Settings > For a forked project', :js do end it 'renders form for incident management' do - expect(page).to have_selector('h4', text: 'Incidents') + expect(page).to have_selector('h3', text: 'Incidents') end it 'sets correct default values' do diff --git a/spec/features/projects/settings/integration_settings_spec.rb b/spec/features/projects/settings/webhooks_settings_spec.rb index de987b879eb..7e22117c63c 100644 --- a/spec/features/projects/settings/integration_settings_spec.rb +++ b/spec/features/projects/settings/webhooks_settings_spec.rb @@ -2,11 +2,10 @@ require 'spec_helper' -describe 'Projects > Settings > Integration settings' do +describe 'Projects > Settings > Webhook Settings' do let(:project) { create(:project) } let(:user) { create(:user) } - let(:role) { :developer } - let(:integrations_path) { project_settings_integrations_path(project) } + let(:webhooks_path) { project_hooks_path(project) } before do sign_in(user) @@ -17,7 +16,7 @@ describe 'Projects > Settings > Integration settings' do let(:role) { :developer } it 'to be disallowed to view' do - visit integrations_path + visit webhooks_path expect(page.status_code).to eq(404) end @@ -33,7 +32,7 @@ describe 'Projects > Settings > Integration settings' do it 'show list of webhooks' do hook - visit integrations_path + visit webhooks_path expect(page.status_code).to eq(200) expect(page).to have_content(hook.url) @@ -49,7 +48,7 @@ describe 'Projects > Settings > Integration settings' do end it 'create webhook' do - visit integrations_path + visit webhooks_path fill_in 'hook_url', with: url check 'Tag push events' @@ -68,7 +67,7 @@ describe 'Projects > Settings > Integration settings' do it 'edit existing webhook' do hook - visit integrations_path + visit webhooks_path click_link 'Edit' fill_in 'hook_url', with: url @@ -81,25 +80,25 @@ describe 'Projects > Settings > Integration settings' do it 'test existing webhook', :js do WebMock.stub_request(:post, hook.url) - visit integrations_path + visit webhooks_path find('.hook-test-button.dropdown').click click_link 'Push events' - expect(current_path).to eq(integrations_path) + expect(current_path).to eq(webhooks_path) end context 'delete existing webhook' do it 'from webhooks list page' do hook - visit integrations_path + visit webhooks_path expect { click_link 'Delete' }.to change(ProjectHook, :count).by(-1) end it 'from webhook edit page' do hook - visit integrations_path + visit webhooks_path click_link 'Edit' expect { click_link 'Delete' }.to change(ProjectHook, :count).by(-1) |