Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'fix-import-redirect-loop' into 'master'
Fix import redirect loop Fixes #11864 See merge request !2606
- Loading branch information
Showing
2 changed files
with
124 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
require 'spec_helper' | ||
|
||
describe Projects::ImportsController do | ||
let(:user) { create(:user) } | ||
|
||
describe 'GET #show' do | ||
context 'when repository does not exists' do | ||
let(:project) { create(:empty_project) } | ||
|
||
before do | ||
sign_in(user) | ||
project.team << [user, :master] | ||
end | ||
|
||
it 'renders template' do | ||
get :show, namespace_id: project.namespace.to_param, project_id: project.to_param | ||
|
||
expect(response).to render_template :show | ||
end | ||
|
||
it 'sets flash.now if params is present' do | ||
get :show, namespace_id: project.namespace.to_param, project_id: project.to_param, continue: { notice_now: 'Started' } | ||
|
||
expect(flash.now[:notice]).to eq 'Started' | ||
end | ||
end | ||
|
||
context 'when repository exists' do | ||
let(:project) { create(:project_empty_repo, import_url: 'https://github.com/vim/vim.git') } | ||
|
||
before do | ||
sign_in(user) | ||
project.team << [user, :master] | ||
end | ||
|
||
context 'when import is in progress' do | ||
before do | ||
project.update_attribute(:import_status, :started) | ||
end | ||
|
||
it 'renders template' do | ||
get :show, namespace_id: project.namespace.to_param, project_id: project.to_param | ||
|
||
expect(response).to render_template :show | ||
end | ||
|
||
it 'sets flash.now if params is present' do | ||
get :show, namespace_id: project.namespace.to_param, project_id: project.to_param, continue: { notice_now: 'In progress' } | ||
|
||
expect(flash.now[:notice]).to eq 'In progress' | ||
end | ||
end | ||
|
||
context 'when import failed' do | ||
before do | ||
project.update_attribute(:import_status, :failed) | ||
end | ||
|
||
it 'redirects to new_namespace_project_import_path' do | ||
get :show, namespace_id: project.namespace.to_param, project_id: project.to_param | ||
|
||
expect(response).to redirect_to new_namespace_project_import_path(project.namespace, project) | ||
end | ||
end | ||
|
||
context 'when import finished' do | ||
before do | ||
project.update_attribute(:import_status, :finished) | ||
end | ||
|
||
context 'when project is a fork' do | ||
it 'redirects to namespace_project_path' do | ||
allow_any_instance_of(Project).to receive(:forked?).and_return(true) | ||
|
||
get :show, namespace_id: project.namespace.to_param, project_id: project.to_param | ||
|
||
expect(flash[:notice]).to eq 'The project was successfully forked.' | ||
expect(response).to redirect_to namespace_project_path(project.namespace, project) | ||
end | ||
end | ||
|
||
context 'when project is external' do | ||
it 'redirects to namespace_project_path' do | ||
get :show, namespace_id: project.namespace.to_param, project_id: project.to_param | ||
|
||
expect(flash[:notice]).to eq 'The project was successfully imported.' | ||
expect(response).to redirect_to namespace_project_path(project.namespace, project) | ||
end | ||
end | ||
|
||
context 'when continue params is present' do | ||
let(:params) do | ||
{ | ||
to: namespace_project_path(project.namespace, project), | ||
notice: 'Finished' | ||
} | ||
end | ||
|
||
it 'redirects to params[:to]' do | ||
get :show, namespace_id: project.namespace.to_param, project_id: project.to_param, continue: params | ||
|
||
expect(flash[:notice]).to eq params[:notice] | ||
expect(response).to redirect_to params[:to] | ||
end | ||
end | ||
end | ||
end | ||
end | ||
end |