diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-24 03:12:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-24 03:12:33 +0300 |
commit | 1c27dcaf69cd0181755172d94c87c823e4d5f069 (patch) | |
tree | 4cf0f9084d3c3878bd31aed8a3f3c2bec0b8da0f /spec/features | |
parent | abd24a801e8dbe0942558dd2b2cad90e7e01938e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/issues/user_edits_issue_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/fork_spec.rb | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/spec/features/issues/user_edits_issue_spec.rb b/spec/features/issues/user_edits_issue_spec.rb index 76cec2502e3..b2e7ac9cb0b 100644 --- a/spec/features/issues/user_edits_issue_spec.rb +++ b/spec/features/issues/user_edits_issue_spec.rb @@ -146,7 +146,7 @@ RSpec.describe "Issues > User edits issue", :js do fill_in 'Comment', with: '/label ~syzygy' click_button 'Comment' - expect(page).to have_text('added syzygy label just now') + expect(page).to have_text('added syzygy label just now', wait: 300) page.within '.block.labels' do # Remove `verisimilitude` label diff --git a/spec/features/projects/fork_spec.rb b/spec/features/projects/fork_spec.rb index 69e4303cce7..f9a6b67e469 100644 --- a/spec/features/projects/fork_spec.rb +++ b/spec/features/projects/fork_spec.rb @@ -59,10 +59,11 @@ RSpec.describe 'Project fork' do context 'forking is disabled' do let(:forking_access_level) { ProjectFeature::DISABLED } - it 'does not render fork button' do + it 'render a disabled fork button' do visit project_path(project) - expect(page).not_to have_css('a', text: 'Fork') + expect(page).to have_css('a.disabled', text: 'Fork') + expect(page).to have_css('a.count', text: '0') end it 'does not render new project fork page' do @@ -80,10 +81,11 @@ RSpec.describe 'Project fork' do end context 'user is not a team member' do - it 'does not render fork button' do + it 'render a disabled fork button' do visit project_path(project) - expect(page).not_to have_css('a', text: 'Fork') + expect(page).to have_css('a.disabled', text: 'Fork') + expect(page).to have_css('a.count', text: '0') end it 'does not render new project fork page' do @@ -102,6 +104,7 @@ RSpec.describe 'Project fork' do visit project_path(project) expect(page).to have_css('a', text: 'Fork') + expect(page).to have_css('a.count', text: '0') expect(page).not_to have_css('a.disabled', text: 'Fork') end |