@@ -17,10 +17,11 @@ class Admin::InstallController < ApplicationController @site = Site.new params[:site] @section = @site.sections.build(params[:content]) - @user = User.new + @user = User.new(params[:user]) + @user.name = @user.first_name_from_email if request.post? - if @site.valid? && @section.valid? + if @site.valid? && @section.valid? && @user.valid? @site.save @user = User.create_superuser params[:user] @@ -33,7 +34,7 @@ class Admin::InstallController < ApplicationController flash.now[:notice] = t(:'adva.sites.flash.install.success') render :action => :confirmation else - models = [@site, @section].map{|model| model.class.name unless model.valid?}.compact + models = [@site, @section, @user].map{|model| model.class.name unless model.valid?}.compact flash.now[:error] = t(:'adva.sites.flash.install.failure', :models => models.join(', ')) end end engines/adva_cms/app/controllers/admin/install_controller.rb @@ -10,6 +10,24 @@ class InstallationTest < ActionController::IntegrationTest Site.delete_all User.delete_all end + + test "user should not be able to install the initial site without a valid email" do + # go to root page + get "/" + + # user should see the install template + assert_template "admin/install/index" + + # fill in the form and submit the form + fill_in :site_name, :with => "adva-cms test" + fill_in :user_email, :with => "test" + fill_in :user_password, :with => "test_password" + fill_in :section_title, :with => "Home" + click_button "Create" + + # check that a new site is created + assert_equal 0, Site.count + end test "user installs the initial site, manages the new site, logs out and views the empty frontend" do # go to root page engines/adva_cms/test/integration/installation_test.rb 616edf10304c03c852462eec2df551258e5fe8a4 Marko Seppae marko.seppa@gmail.com http://github.com/svenfuchs/adva_cms/commit/c0d9f9a7742d9b360fc8b3d36c460585659c5014 c0d9f9a7742d9b360fc8b3d36c460585659c5014 2009-07-09T04:36:35-07:00 2009-07-09T04:36:35-07:00 installation process does not accept user with invalid email anymore c3db977d71f64b3d818d67d1062f47a1ebc61e8f Marko Seppae marko.seppa@gmail.com