diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 09:09:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 09:09:06 +0300 |
commit | cefe554b7ce2d0b52f9de855be832a47c2bc24ab (patch) | |
tree | 74c1ad2f688afd2f806aaf94e73e0bcd128cea00 /spec/features | |
parent | 5ee120f46740efac7b8a460d7a92e4da82f4fb0b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/clusters/installing_applications_shared_examples.rb | 2 | ||||
-rw-r--r-- | spec/features/dashboard/projects_spec.rb | 55 |
2 files changed, 2 insertions, 55 deletions
diff --git a/spec/features/clusters/installing_applications_shared_examples.rb b/spec/features/clusters/installing_applications_shared_examples.rb index 20648ed3d46..ff44ce46213 100644 --- a/spec/features/clusters/installing_applications_shared_examples.rb +++ b/spec/features/clusters/installing_applications_shared_examples.rb @@ -187,6 +187,8 @@ shared_examples "installing applications on a cluster" do page.within('.js-cluster-application-row-elastic_stack') do click_button 'Install' end + + wait_for_requests end it 'shows status transition' do diff --git a/spec/features/dashboard/projects_spec.rb b/spec/features/dashboard/projects_spec.rb index 73f759f8a54..9bd2e85e3b8 100644 --- a/spec/features/dashboard/projects_spec.rb +++ b/spec/features/dashboard/projects_spec.rb @@ -152,61 +152,6 @@ describe 'Dashboard Projects' do end end - describe 'with a pipeline', :clean_gitlab_redis_shared_state do - let(:pipeline) { create(:ci_pipeline, project: project, sha: project.commit.sha, ref: project.default_branch) } - - before do - # Since the cache isn't updated when a new pipeline is created - # we need the pipeline to advance in the pipeline since the cache was created - # by visiting the login page. - pipeline.succeed - end - - it 'shows that the last pipeline passed' do - visit dashboard_projects_path - - page.within('.controls') do - expect(page).to have_xpath("//a[@href='#{pipelines_project_commit_path(project, project.commit, ref: pipeline.ref)}']") - expect(page).to have_css('.ci-status-link') - expect(page).to have_css('.ci-status-icon-success') - expect(page).to have_link('Pipeline: passed') - end - end - - shared_examples 'hidden pipeline status' do - it 'does not show the pipeline status' do - visit dashboard_projects_path - - page.within('.controls') do - expect(page).not_to have_xpath("//a[@href='#{pipelines_project_commit_path(project, project.commit, ref: pipeline.ref)}']") - expect(page).not_to have_css('.ci-status-link') - expect(page).not_to have_css('.ci-status-icon-success') - expect(page).not_to have_link('Pipeline: passed') - end - end - end - - context 'guest user of project and project has private pipelines' do - let(:guest_user) { create(:user) } - - before do - project.update(public_builds: false) - project.add_guest(guest_user) - sign_in(guest_user) - end - - it_behaves_like 'hidden pipeline status' - end - - context 'when dashboard_pipeline_status is disabled' do - before do - stub_feature_flags(dashboard_pipeline_status: false) - end - - it_behaves_like 'hidden pipeline status' - end - end - context 'last push widget', :use_clean_rails_memory_store_caching do before do event = create(:push_event, project: project, author: user) |