typus 0.9.29 → 0.9.30

data/test/functional/admin/{status_controller_test.rb → master_controller_tableless_resource_test.rb}

@@ -1,12 +1,9 @@
 require 'test/helper'
 
-# Test resources which are not related to an ActiveRecord model.
-
 class Admin::StatusControllerTest < ActionController::TestCase
 
   def setup
-    @typus_user = typus_users(:admin)
-    @request.session[:typus_user_id] = @typus_user.id
+    @request.session[:typus_user_id] = typus_users(:admin).id
   end
 
   def test_should_verify_admin_can_go_to_index
@@ -22,21 +19,18 @@ class Admin::StatusControllerTest < ActionController::TestCase
     assert_redirected_to admin_sign_in_path(:back_to => '/admin/status')
   end
 
-  def test_should_verify_admin_can_not_go_to_show
+  def test_should_verify_admin_cannot_go_to_show
     get :show
     assert_response :redirect
     assert_redirected_to admin_dashboard_path
-    assert flash[:notice]
-    assert_equal "#{@typus_user.role.capitalize} can't go to show on status.", flash[:notice]
+    assert_equal "Admin can't go to show on status.", flash[:notice]
   end
 
   def test_should_verify_editor_can_not_go_to_index
-    typus_user = typus_users(:editor)
-    @request.session[:typus_user_id] = typus_user.id
+    @request.session[:typus_user_id] = typus_users(:editor).id
     get :index
     assert_response :redirect
-    assert flash[:notice]
-    assert_equal "#{typus_user.role.capitalize} can't go to index on status.", flash[:notice]
+    assert_equal "Editor can't go to index on status.", flash[:notice]
   end
 
 end

data/test/functional/admin/{typus_users_controller_test.rb → master_controller_typus_users_test.rb}

@@ -1,13 +1,12 @@
 require 'test/helper'
 
-# Test what TypusUsers can do.
-
 class Admin::TypusUsersControllerTest < ActionController::TestCase
 
   def setup
     Typus::Configuration.options[:root] = 'admin'
     @typus_user = typus_users(:admin)
     @request.session[:typus_user_id] = @typus_user.id
+    @request.env['HTTP_REFERER'] = '/admin/typus_users'
   end
 
   def test_should_allow_admin_to_create_typus_users
@@ -17,84 +16,69 @@ class Admin::TypusUsersControllerTest < ActionController::TestCase
 
   def test_should_not_allow_admin_to_toggle_her_status
 
-    @request.env['HTTP_REFERER'] = '/admin/typus_users'
     get :toggle, { :id => @typus_user.id, :field => 'status' }
 
     assert_response :redirect
     assert_redirected_to @request.env['HTTP_REFERER']
-    assert flash[:notice]
     assert_equal "You can't toggle your status.", flash[:notice]
 
   end
 
   def test_should_allow_admin_to_toggle_other_users_status
 
-    @request.env['HTTP_REFERER'] = '/typus/typus_users'
-    editor = typus_users(:editor)
-    get :toggle, { :id => editor.id, :field => 'status' }
+    get :toggle, { :id => typus_users(:editor).id, :field => 'status' }
 
     assert_response :redirect
     assert_redirected_to @request.env['HTTP_REFERER']
-    assert flash[:success]
     assert_equal "Typus user status changed.", flash[:success]
 
   end
 
   def test_should_not_allow_non_root_typus_user_to_toggle_status
 
-    @request.env['HTTP_REFERER'] = '/admin/typus_users'
-    @typus_user = typus_users(:editor)
-    @request.session[:typus_user_id] = @typus_user.id
-    get :toggle, { :id => @typus_user.id, :field => 'status' }
+    typus_user = typus_users(:editor)
+    @request.session[:typus_user_id] = typus_user.id
+    get :toggle, { :id => typus_user.id, :field => 'status' }
 
     assert_response :redirect
     assert_redirected_to @request.env['HTTP_REFERER']
-    assert flash[:notice]
     assert_equal "You're not allowed to toggle status.", flash[:notice]
 
   end
 
   def test_should_verify_admin_cannot_destroy_herself
 
-    @request.env['HTTP_REFERER'] = '/admin/typus_users'
-
     assert_difference('TypusUser.count', 0) do
       delete :destroy, :id => @typus_user.id
     end
 
     assert_response :redirect
     assert_redirected_to @request.env['HTTP_REFERER']
-    assert flash[:notice]
     assert_equal "You can't remove yourself.", flash[:notice]
 
   end
 
   def test_should_verify_admin_can_destroy_others
 
-    @request.env['HTTP_REFERER'] = '/admin/typus_users'
-
     assert_difference('TypusUser.count', -1) do
       delete :destroy, :id => typus_users(:editor).id
     end
 
     assert_response :redirect
     assert_redirected_to @request.env['HTTP_REFERER']
-    assert flash[:success]
     assert_equal "Typus user successfully removed.", flash[:success]
 
   end
 
   def test_should_not_allow_editor_to_create_typus_users
 
-    @request.env['HTTP_REFERER'] = '/typus/typus_users'
     typus_user = typus_users(:editor)
     @request.session[:typus_user_id] = typus_user.id
     get :new
 
     assert_response :redirect
     assert_redirected_to @request.env['HTTP_REFERER']
-    assert flash[:notice]
-    assert_equal "Editor can't perform action (new).", flash[:notice].to_s
+    assert_equal "Editor can't perform action. (new)", flash[:notice].to_s
 
   end
 
@@ -118,7 +102,6 @@ class Admin::TypusUsersControllerTest < ActionController::TestCase
 
     assert_response :redirect
     assert_redirected_to @request.env['HTTP_REFERER']
-    assert flash[:success]
     assert_equal "Typus user successfully updated.", flash[:success]
 
   end
@@ -136,14 +119,12 @@ class Admin::TypusUsersControllerTest < ActionController::TestCase
 
     assert_response :redirect
     assert_redirected_to @request.env['HTTP_REFERER']
-    assert flash[:notice]
     assert_equal "You can't change your role.", flash[:notice]
 
   end
 
   def test_should_not_allow_editor_to_edit_other_users_profiles
 
-    @request.env['HTTP_REFERER'] = '/admin/typus_users'
     typus_user = typus_users(:editor)
     @request.session[:typus_user_id] = typus_user.id
     get :edit, { :id => typus_user.id }
@@ -155,35 +136,30 @@ class Admin::TypusUsersControllerTest < ActionController::TestCase
 
     assert_response :redirect
     assert_redirected_to @request.env['HTTP_REFERER']
-    assert flash[:notice]
     assert_equal "As you're not the admin or the owner of this record you cannot edit it.", flash[:notice]
 
   end
 
   def test_should_not_allow_editor_to_destroy_users
 
-    @request.env['HTTP_REFERER'] = '/admin/typus_users'
     typus_user = typus_users(:editor)
     @request.session[:typus_user_id] = typus_user.id
     delete :destroy, :id => typus_users(:admin).id
 
     assert_response :redirect
     assert_redirected_to @request.env['HTTP_REFERER']
-    assert flash[:notice]
     assert_equal "You're not allowed to remove Typus Users.", flash[:notice]
 
   end
 
   def test_should_not_allow_editor_to_destroy_herself
 
-    @request.env['HTTP_REFERER'] = '/admin/typus_users'
     typus_user = typus_users(:editor)
     @request.session[:typus_user_id] = typus_user.id
     delete :destroy, :id => typus_user.id
 
     assert_response :redirect
     assert_redirected_to @request.env['HTTP_REFERER']
-    assert flash[:notice]
     assert_equal "You're not allowed to remove Typus Users.", flash[:notice]
 
   end
@@ -197,7 +173,6 @@ class Admin::TypusUsersControllerTest < ActionController::TestCase
 
     assert_response :redirect
     assert_redirected_to @request.env['HTTP_REFERER']
-    assert flash[:notice]
     assert_equal "Designer can't display items.", flash[:notice]
 
   end
@@ -206,17 +181,15 @@ class Admin::TypusUsersControllerTest < ActionController::TestCase
 
     typus_user = typus_users(:editor)
     @request.session[:typus_user_id] = typus_user.id
-    @request.env['HTTP_REFERER'] = '/admin/typus_users'
 
     assert_equal 'editor', typus_user.role
 
-    get :edit, :id => typus_user.id
+    get :edit, { :id => typus_user.id }
     assert_response :success
 
-    get :edit, :id => typus_users(:admin).id
+    get :edit, { :id => typus_users(:admin).id }
     assert_response :redirect
     assert_redirected_to @request.env['HTTP_REFERER']
-    assert flash[:notice]
     assert_equal "As you're not the admin or the owner of this record you cannot edit it.", flash[:notice]
 
     ##
@@ -227,10 +200,10 @@ class Admin::TypusUsersControllerTest < ActionController::TestCase
     options = Typus::Configuration.options.merge(:root => 'editor')
     Typus::Configuration.stubs(:options).returns(options)
 
-    get :edit, :id => typus_user.id
+    get :edit, { :id => typus_user.id }
     assert_response :success
 
-    get :edit, :id => typus_users(:admin).id
+    get :edit, { :id => typus_users(:admin).id }
     assert_response :success
 
   end

data/test/functional/typus_controller_test.rb

@@ -1,25 +1,22 @@
 require 'test/helper'
 
-# Test TypusController:
-#
-# - sign_up, sign_in & sign_out
-# - dashboard
-# - reset_password, recover_password
-
 class TypusControllerTest < ActionController::TestCase
 
   def setup
-    Typus::Configuration.options[:recover_password] = true
-    Typus::Configuration.options[:app_name] = 'whatistypus.com'
+    # Typus::Configuration.options[:recover_password] = true
   end
 
-  def test_should_render_login
+  ##
+  # get :sign_in
+  ##
+
+  def test_should_sign_in
     get :sign_in
     assert_response :success
     assert_template 'sign_in'
   end
 
-  def test_should_sign_in_and_redirect_to_dashboard
+  def test_should_sign_in_with_post_and_redirect_to_dashboard
     typus_user = typus_users(:admin)
     post :sign_in, { :user => { :email => typus_user.email, :password => '12345678' } }
     assert_equal typus_user.id, @request.session[:typus_user_id]
@@ -27,11 +24,10 @@ class TypusControllerTest < ActionController::TestCase
     assert_redirected_to admin_dashboard_path
   end
 
-  def test_should_return_message_when_sign_in_fails
+  def test_should_sign_in_with_post_and_redirect_to_sign_in_with_an_error
     post :sign_in, { :user => { :email => 'john@example.com', :password => 'XXXXXXXX' } }
     assert_response :redirect
     assert_redirected_to admin_sign_in_path
-    assert flash[:error]
     assert_equal "The email and/or password you entered is invalid.", flash[:error]
   end
 
@@ -52,24 +48,33 @@ class TypusControllerTest < ActionController::TestCase
     get :dashboard
     assert_redirected_to admin_sign_in_path
     assert_nil @request.session[:typus_user_id]
-    assert flash[:notice]
-    assert_equal 'Role does no longer exists.', flash[:notice]
+    assert_equal "Role does no longer exists.", flash[:notice]
   end
 
   def test_should_not_send_recovery_password_link_to_unexisting_user
+
+    options = Typus::Configuration.options.merge(:recover_password => true)
+    Typus::Configuration.stubs(:options).returns(options)
+
     post :recover_password, { :user => { :email => 'unexisting' } }
     assert_response :redirect
     assert_redirected_to admin_recover_password_path
     [ :notice, :error, :warning ].each { |f| assert !flash[f] }
+
   end
 
   def test_should_send_recovery_password_link_to_existing_user
+
+    options = Typus::Configuration.options.merge(:recover_password => true)
+    Typus::Configuration.stubs(:options).returns(options)
+
     admin = typus_users(:admin)
     post :recover_password, { :user => { :email => admin.email } }
+
     assert_response :redirect
     assert_redirected_to admin_sign_in_path
-    assert flash[:success]
-    assert_match /Password recovery link sent to your email/, flash[:success]
+    assert_equal "Password recovery link sent to your email.", flash[:success]
+
   end
 
   def test_should_sign_out
@@ -82,7 +87,7 @@ class TypusControllerTest < ActionController::TestCase
     [ :notice, :error, :warning ].each { |f| assert !flash[f] }
   end
 
-  def test_should_verify_we_can_disable_users_and_block_acess_on_the_fly
+  def test_should_verify_block_users_on_the_fly
 
     admin = typus_users(:admin)
     @request.session[:typus_user_id] = admin.id
@@ -98,130 +103,192 @@ class TypusControllerTest < ActionController::TestCase
     assert_response :redirect
     assert_redirected_to admin_sign_in_path
 
-    assert flash[:notice]
     assert_equal "Typus user has been disabled.", flash[:notice]
     assert_nil @request.session[:typus_user_id]
 
   end
 
-  def test_should_not_allow_reset_password_if_disabled
+  ##
+  # reset_password
+  ##
+
+  def test_should_not_reset_password
+
+    get :reset_password
+    assert_response :redirect
+    assert_redirected_to admin_sign_in_path
+
+  end
+
+  def test_should_reset_password_when_recover_password_is_true
+
+    options = Typus::Configuration.options.merge(:recover_password => true)
+    Typus::Configuration.stubs(:options).returns(options)
 
     typus_user = typus_users(:admin)
     get :reset_password, { :token => typus_user.token }
+
     assert_response :success
     assert_template 'reset_password'
 
-    options = Typus::Configuration.options.merge(:recover_password => false)
-    Typus::Configuration.stubs(:options).returns(options)
+  end
 
-    get :reset_password
-    assert_response :redirect
-    assert_redirected_to admin_sign_in_path
+  def test_should_redirect_to_sign_in_user_after_reset_password
 
-  end
+    options = Typus::Configuration.options.merge(:recover_password => true)
+    Typus::Configuration.stubs(:options).returns(options)
 
-  def test_should_sign_in_user_after_password_change
     typus_user = typus_users(:admin)
     post :reset_password, { :token => typus_user.token, :user => { :password => '12345678', :password_confirmation => '12345678' } }
+
     assert_response :redirect
     assert_redirected_to admin_dashboard_path
+
   end
 
   def test_should_be_redirected_if_password_does_not_match_confirmation
+
+    options = Typus::Configuration.options.merge(:recover_password => true)
+    Typus::Configuration.stubs(:options).returns(options)
+
     typus_user = typus_users(:admin)
     post :reset_password, { :token => typus_user.token, :user => { :password => 'drowssap', :password_confirmation => 'drowssap2' } }
     assert_response :success
+
   end
 
   def test_should_only_be_allowed_to_reset_password
+
+    options = Typus::Configuration.options.merge(:recover_password => true)
+    Typus::Configuration.stubs(:options).returns(options)
+
     typus_user = typus_users(:admin)
     post :reset_password, { :token => typus_user.token, :user => { :password => 'drowssap', :password_confirmation => 'drowssap', :role => 'superadmin' } }
     typus_user.reload
     assert_not_equal typus_user.role, 'superadmin'
+
   end
 
-  def test_should_return_404_when_reseting_passsowrd_if_token_is_invalid
+  def test_should_return_404_on_reset_passsword_if_token_is_not_valid
+
+    options = Typus::Configuration.options.merge(:recover_password => true)
+    Typus::Configuration.stubs(:options).returns(options)
+
     assert_raise(ActiveRecord::RecordNotFound) { get :reset_password, { :token => 'INVALID' } }
+
   end
 
-  def test_should_allow_a_user_with_valid_token_to_change_password
+  def test_should_reset_password_with_valid_token
+
+    options = Typus::Configuration.options.merge(:recover_password => true)
+    Typus::Configuration.stubs(:options).returns(options)
+
     typus_user = typus_users(:admin)
     get :reset_password, { :token => typus_user.token }
     assert_response :success
     assert_template 'reset_password'
-  end
 
-  def test_should_verify_typus_sign_in_layout_includes_recover_password_link
-    options = Typus::Configuration.options.merge(:recover_password => true)
-    Typus::Configuration.stubs(:options).returns(options)
-    get :sign_in
-    assert @response.body.include?('Recover password')
   end
 
-  def test_should_verify_typus_sign_in_layout_does_not_include_recover_password_link
-    options = Typus::Configuration.options.merge(:recover_password => false)
-    Typus::Configuration.stubs(:options).returns(options)
-    get :sign_in
-    assert !@response.body.include?('Recover password')
-  end
+  ##
+  # sign_up
+  ##
+
+  def test_should_verify_sign_up_works
+
+    TypusUser.destroy_all
+    assert TypusUser.find(:all).empty?
+
+    get :sign_up
 
-  def test_should_render_typus_login_footer
-    expected = 'Typus'
-    get :sign_in
     assert_response :success
-    assert_match /#{expected}/, @response.body
+    assert_template 'sign_up'
     assert_match /layouts\/typus/, @controller.active_layout.to_s
+    assert_equal "Enter your email below to create the first user.", flash[:notice]
+
   end
 
-  def test_should_render_admin_login_bottom
-    get :sign_in
+  def test_should_should_not_sign_up_invalid_email
+
+    TypusUser.destroy_all
+
+    post :sign_up, :user => { :email => 'example.com' }
+
     assert_response :success
-    assert_select 'h1', 'whatistypus.com'
-    assert_match /layouts\/typus/, @controller.active_layout.to_s
-  end
+    assert_equal "That doesn't seem like a valid email address.", flash[:error]
 
-  def test_should_verify_page_title_on_sign_in
-    get :sign_in
-    assert_select 'title', "#{Typus::Configuration.options[:app_name]} - Sign in"
   end
 
-  def test_should_create_first_typus_user
+  def test_should_sign_up_valid_email
 
     TypusUser.destroy_all
-    assert_nil @request.session[:typus_user_id]
-    assert TypusUser.find(:all).empty?
 
-    get :sign_in
+    assert_difference 'TypusUser.count' do
+      post :sign_up, :user => { :email => 'john@example.com' }
+    end
+
     assert_response :redirect
-    assert_redirected_to admin_sign_up_path
+    assert_redirected_to admin_dashboard_path
+    assert_equal %Q[Password set to "columbia".], flash[:notice]
+    assert @request.session[:typus_user_id]
 
-    get :sign_up
-    assert flash[:notice]
-    assert_equal 'Enter your email below to create the first user.', flash[:notice]
+  end
 
-    post :sign_up, :user => { :email => 'example.com' }
+  ##
+  # sign_in
+  ##
+
+  def test_should_render_sign_in
+
+    options = Typus::Configuration.options.merge(:app_name => 'Typus Test')
+    Typus::Configuration.stubs(:options).returns(options)
+
+    get :sign_in
     assert_response :success
-    assert flash[:error]
-    assert_equal 'That doesn\'t seem like a valid email address.', flash[:error]
 
-    post :sign_up, :user => { :email => 'john@example.com' }
+    assert_select 'title', "Typus Test - Sign in"
+    assert_select 'h1', 'Typus Test'
+    assert_match /layouts\/typus/, @controller.active_layout.to_s
+
+  end
+
+  def test_should_redirect_to_sign_up_when_no_typus_users
+    TypusUser.destroy_all
+    get :sign_in
     assert_response :redirect
-    assert_redirected_to admin_dashboard_path
-    assert flash[:notice]
-    assert_equal "Password set to \"columbia\".", flash[:notice]
-    assert @request.session[:typus_user_id]
-    assert !TypusUser.find(:all).empty?
+    assert_redirected_to admin_sign_up_path
+  end
 
+  def test_should_verify_typus_sign_in_layout_does_not_include_recover_password_link
+    options = Typus::Configuration.options.merge(:recover_password => false)
+    Typus::Configuration.stubs(:options).returns(options)
+    get :sign_in
+    assert !@response.body.include?('Recover password')
+  end
+
+  def test_should_verify_typus_sign_in_layout_includes_recover_password_link
+    options = Typus::Configuration.options.merge(:recover_password => true)
+    Typus::Configuration.stubs(:options).returns(options)
+    get :sign_in
+    assert @response.body.include?('Recover password')
+  end
+
+  ##
+  # sign_out
+  ##
+
+  def test_should_verify_sign_out
+    @request.session[:typus_user_id] = typus_users(:admin).id
     get :sign_out
     assert_nil @request.session[:typus_user_id]
     assert_redirected_to admin_sign_in_path
-
-    get :sign_up
-    assert_redirected_to admin_sign_in_path
-
   end
 
-  def test_should_redirect_to_login_if_not_logged
+  ##
+  # get dashboard
+  ##
+
+  def test_should_redirect_to_sign_in_when_not_signed_in
     @request.session[:typus_user_id] = nil
     get :dashboard
     assert_response :redirect
@@ -229,96 +296,47 @@ class TypusControllerTest < ActionController::TestCase
   end
 
   def test_should_render_dashboard
+
     @request.session[:typus_user_id] = typus_users(:admin).id
     get :dashboard
+
     assert_response :success
     assert_template 'dashboard'
-    assert_match 'whatistypus.com', @response.body
     assert_match /layouts\/admin/, @controller.active_layout.to_s
-  end
-
-  def test_should_verify_sign_up_works
-    @request.session[:typus_user_id] = typus_users(:admin).id
-    TypusUser.destroy_all
-    get :sign_up
-    assert_response :success
-    assert_template 'sign_up'
-    assert_match /layouts\/typus/, @controller.active_layout.to_s
-  end
-
-  def test_should_verify_page_title_on_dashboard
-    @request.session[:typus_user_id] = typus_users(:admin).id
-    get :dashboard
     assert_select 'title', "#{Typus::Configuration.options[:app_name]} - Dashboard"
-  end
-
-  def test_should_verify_link_to_edit_typus_user
 
-    typus_user = typus_users(:admin)
-    @request.session[:typus_user_id] = typus_user.id
-    get :dashboard
-    assert_response :success
+    [ 'Typus', 
+      %Q[href="/admin/sign_out"], 
+      %Q[href="/admin/typus_users/edit/#{@request.session[:typus_user_id]}] ].each do |string|
+      assert_match string, @response.body
+    end
 
-    assert_match "href=\"\/admin\/typus_users\/edit\/#{typus_user.id}\"", @response.body
+    %w( typus_users posts pages assets ).each { |r| assert_match "/admin/#{r}/new", @response.body }
+    %w( statuses orders ).each { |r| assert_no_match /\/admin\/#{r}\n/, @response.body }
 
     assert_select 'body div#header' do
       assert_select 'a', 'Admin Example'
       assert_select 'a', 'Sign out'
     end
 
-  end
-
-  def test_should_verify_link_to_sign_out
-
-    @request.session[:typus_user_id] = typus_users(:admin).id
-    get :dashboard
-    assert_response :success
-
-    assert_match "href=\"\/admin\/sign_out\"", @response.body
-
-  end
-
-  def test_should_show_add_links_in_resources_list_for_admin
-
-    @request.session[:typus_user_id] = typus_users(:admin).id
-    get :dashboard
-
-    %w( typus_users posts pages assets ).each do |resource|
-      assert_match "/admin/#{resource}/new", @response.body
-    end
-
-    %w( statuses orders ).each do |resource|
-      assert_no_match /\/admin\/#{resource}\n/, @response.body
-    end
+    partials = %w( _sidebar.html.erb )
+    partials.each { |p| assert_match p, @response.body }
 
   end
 
   def test_should_show_add_links_in_resources_list_for_editor
-    editor = typus_users(:editor)
-    @request.session[:typus_user_id] = editor.id
+    @request.session[:typus_user_id] = typus_users(:editor).id
     get :dashboard
     assert_match '/admin/posts/new', @response.body
     assert_no_match /\/admin\/typus_users\/new/, @response.body
-    # We have loaded categories as a module, so are not displayed 
-    # on the applications list.
     assert_no_match /\/admin\/categories\/new/, @response.body
   end
 
   def test_should_show_add_links_in_resources_list_for_designer
-    designer = typus_users(:designer)
-    @request.session[:typus_user_id] = designer.id
+    @request.session[:typus_user_id] = typus_users(:designer).id
     get :dashboard
     assert_no_match /\/admin\/posts\/new/, @response.body
     assert_no_match /\/admin\/typus_users\/new/, @response.body
   end
 
-  def test_should_render_application_dashboard_template_extensions
-    admin = typus_users(:admin)
-    @request.session[:typus_user_id] = admin.id
-    get :dashboard
-    assert_response :success
-    partials = %w( _sidebar.html.erb )
-    partials.each { |p| assert_match p, @response.body }
-  end
-
 end