Commit 3b02507e authored by James Fargher's avatar James Fargher

Merge branch 'project-settings-pkg-license-cleanup' into 'master'

Cleanup package code to remove license reference

See merge request gitlab-org/gitlab!39021
parents e1724883 a09074e9
......@@ -16,13 +16,11 @@ RSpec.describe 'Projects > Settings > Packages', :js do
allow(Gitlab.config.packages).to receive(:enabled).and_return(true)
end
context 'without the need for a license' do
it 'displays the packages toggle button' do
visit edit_project_path(project)
it 'displays the packages toggle button' do
visit edit_project_path(project)
expect(page).to have_content('Packages')
expect(page).to have_selector('input[name="project[packages_enabled]"] + button', visible: true)
end
expect(page).to have_content('Packages')
expect(page).to have_selector('input[name="project[packages_enabled]"] + button', visible: true)
end
end
......
......@@ -2361,14 +2361,12 @@ RSpec.describe API::Projects do
expect(project.packages_enabled).to be true
end
context 'without the need for a license' do
it 'disables project packages feature' do
put(api("/projects/#{project.id}", user), params: { packages_enabled: false })
it 'disables project packages feature' do
put(api("/projects/#{project.id}", user), params: { packages_enabled: false })
expect(response).to have_gitlab_http_status(:ok)
expect(project.reload.packages_enabled).to be false
expect(json_response['packages_enabled']).to eq(false)
end
expect(response).to have_gitlab_http_status(:ok)
expect(project.reload.packages_enabled).to be false
expect(json_response['packages_enabled']).to eq(false)
end
end
......
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