Commit 95206808 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch...

Merge branch '327708-flaky-test-spec-features-projects_spec-rb-186-project-remove-forked-relationship-removes-fork' into 'master'

Delete a duplicated test and fix a flaky test

See merge request gitlab-org/gitlab!59392
parents f9d574fb bb90ecba
......@@ -25,7 +25,8 @@ RSpec.describe 'Projects > Settings > For a forked project', :js do
fill_in('confirm_name_input', with: forked_project.name)
click_button('Confirm')
expect(page).to have_content('The fork relationship has been removed.')
wait_for_requests
expect(forked_project.reload.forked?).to be_falsy
end
end
......
......@@ -174,26 +174,6 @@ RSpec.describe 'Project' do
end
end
describe 'remove forked relationship', :js do
let(:user) { create(:user) }
let(:project) { fork_project(create(:project, :public), user, namespace: user.namespace) }
before do
sign_in user
visit edit_project_path(project)
end
it 'removes fork', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/327817' do
expect(page).to have_content 'Remove fork relationship'
remove_with_confirm('Remove fork relationship', project.path)
expect(page).to have_content 'The fork relationship has been removed.'
expect(project.reload.forked?).to be_falsey
expect(page).not_to have_content 'Remove fork relationship'
end
end
describe 'showing information about source of a project fork' do
let(:user) { create(:user) }
let(:base_project) { create(:project, :public, :repository) }
......
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