Fix 500 error when rename repository
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
25d793eac5
commit
b8b8a34b52
3 changed files with 18 additions and 4 deletions
|
@ -9,7 +9,7 @@ module Projects
|
||||||
|
|
||||||
new_branch = params[:project].delete(:default_branch)
|
new_branch = params[:project].delete(:default_branch)
|
||||||
|
|
||||||
if project.repository.exists? && new_branch != project.default_branch
|
if project.repository.exists? && new_branch && new_branch != project.default_branch
|
||||||
project.change_head(new_branch)
|
project.change_head(new_branch)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -19,3 +19,8 @@ Feature: Project Feature
|
||||||
And change project settings
|
And change project settings
|
||||||
And I save project
|
And I save project
|
||||||
Then I should see project with new settings
|
Then I should see project with new settings
|
||||||
|
|
||||||
|
Scenario: I change project path
|
||||||
|
When I visit edit project "Shop" page
|
||||||
|
And change project path settings
|
||||||
|
Then I should see project with new path settings
|
||||||
|
|
|
@ -3,16 +3,25 @@ class ProjectFeature < Spinach::FeatureSteps
|
||||||
include SharedProject
|
include SharedProject
|
||||||
include SharedPaths
|
include SharedPaths
|
||||||
|
|
||||||
And 'change project settings' do
|
step 'change project settings' do
|
||||||
fill_in 'project_name', with: 'NewName'
|
fill_in 'project_name', with: 'NewName'
|
||||||
uncheck 'project_issues_enabled'
|
uncheck 'project_issues_enabled'
|
||||||
end
|
end
|
||||||
|
|
||||||
And 'I save project' do
|
step 'I save project' do
|
||||||
click_button 'Save changes'
|
click_button 'Save changes'
|
||||||
end
|
end
|
||||||
|
|
||||||
Then 'I should see project with new settings' do
|
step 'I should see project with new settings' do
|
||||||
find_field('project_name').value.should == 'NewName'
|
find_field('project_name').value.should == 'NewName'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
step 'change project path settings' do
|
||||||
|
fill_in "project_path", with: "new-path"
|
||||||
|
click_button "Rename"
|
||||||
|
end
|
||||||
|
|
||||||
|
step 'I should see project with new path settings' do
|
||||||
|
project.path.should == "new-path"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue