typus 3.1.0.rc6 → 3.1.0.rc7

data/test/app/controllers/admin/resources/associations_test.rb

@@ -0,0 +1,59 @@
+require "test_helper"
+
+=begin
+
+  What's being tested here?
+
+    - Typus::Controller::Associations
+
+=end
+
+class Admin::CategoriesControllerTest < ActionController::TestCase
+
+  setup do
+    @request.session[:typus_user_id] = Factory(:typus_user).id
+    @request.env['HTTP_REFERER'] = '/admin/categories'
+  end
+
+  ##
+  # We are in:
+  #
+  #   /admin/posts/edit/1
+  #
+  # And we see a list of comments under it:
+  #
+  #   /admin/categories/unrelate/1?resource=Post&resource_id=1
+  #   /admin/categories/unrelate/2?resource=Post&resource_id=1
+  #
+  test "unrelate (has_and_belongs_to_many)" do
+    category = Factory(:category)
+    category.posts << Factory(:post)
+    @request.env['HTTP_REFERER'] = "/admin/dashboard"
+
+    assert_difference('category.posts.count', -1) do
+      post :unrelate, :id => category.id, :resource => 'Post', :resource_id => category.posts.first
+    end
+
+    assert_response :redirect
+    assert_redirected_to @request.env['HTTP_REFERER']
+    assert_equal "Post successfully updated.", flash[:notice]
+  end
+
+  ##
+  # Basically we verify Admin::ResourcesController#create_with_back_to works
+  # as expected for STI models.
+  #
+  # We are editing a Case (which is an STI model). And we click on "Add New"
+  # to add a new category. Once created, we will be redirected and the new
+  # category will be assigned to the current case. Easy right?
+  #
+  test "relate using add new on sti models" do
+    category = { :name => "Category Name" }
+    kase = Factory(:case)
+
+    assert_difference('kase.categories.count') do
+      post :create, { :category => category, :resource => "Case", :resource_id => kase.id, :_saveandassign => true }
+    end
+  end
+
+end

data/test/app/controllers/admin/resources/bulk_test.rb

@@ -0,0 +1,36 @@
+require "test_helper"
+
+=begin
+
+  What's being tested here?
+
+    - Typus::Controller::Trash
+
+=end
+
+class Admin::EntryBulksControllerTest < ActionController::TestCase
+
+  setup do
+    admin_sign_in
+  end
+
+  test "get index will show the available bulk_actions" do
+    get :index
+    assert_equal [["Move to Trash", "bulk_destroy"]], assigns(:bulk_actions)
+  end
+
+  test "get bulk_destroy removes all items" do
+    @request.env['HTTP_REFERER'] = "/admin/entry_bulks"
+
+    10.times { Factory(:entry_bulk) }
+    items_to_destroy = EntryBulk.limit(5).map(&:id)
+    items_to_keep = EntryBulk.limit(5).offset(5).map(&:id)
+
+    get :bulk, :batch_action => "bulk_destroy", :selected_item_ids => items_to_destroy
+    assert_response :redirect
+    assert_redirected_to @request.env['HTTP_REFERER']
+
+    assert_equal items_to_keep, EntryBulk.all.map(&:id)
+  end
+
+end

data/test/app/controllers/admin/{comments_controller_test.rb → resources/comments_controller_test.rb.old}

@@ -1,11 +1,14 @@
 require "test_helper"
 
-##
-# What's being tested here?
-#
-# - Unrelate "Comment" from "Post" (Post#comments)
-# - Search by "Posts.title" (Post#comments)
-#
+=begin
+
+  What's being tested here?
+
+  - Unrelate "Comment" from "Post" (Post#comments)
+  - Search by "Posts.title" (Post#comments)
+
+=end
+
 class Admin::CommentsControllerTest < ActionController::TestCase
 
   setup do

data/test/app/controllers/admin/resources/image_holders_controller_test.rb.old

@@ -0,0 +1,55 @@
+require "test_helper"
+
+=begin
+
+  What's being tested here?
+
+    - Polymorphic associations.
+
+=end
+
+class Admin::ImageHoldersControllerTest < ActionController::TestCase
+
+  setup do
+    admin_sign_in
+  end
+
+  test "create polymorphic association" do
+    bird = Factory(:bird)
+
+    assert_difference('bird.image_holders.count') do
+      post :create, { :image_holder => { :name => "ImageHolder" },
+                      :resource => "Bird", :resource_id => bird.id }
+    end
+
+    assert_response :redirect
+    assert_redirected_to "http://test.host/admin/birds/edit/#{bird.id}"
+    assert_equal "Bird successfully updated.", flash[:notice]
+  end
+
+  ##
+  # We are in:
+  #
+  #   /admin/birds/edit/1
+  #
+  # And we see a list of comments under it:
+  #
+  #   /admin/image_holders/unrelate/1?resource=Bird&resource_id=1
+  #   /admin/image_holders/unrelate/2?resource=Bird&resource_id=1
+  #   ...
+  #
+  # TODO: Eventually this code should be run in the Original model, so ideally
+  #       a Bird unrelates ImageHolder and not ImageHolder unrelates Bird.
+  #
+  test "unrelate" do
+    image_holder = Factory(:image_holder)
+    bird = Factory(:bird)
+    bird.image_holders << image_holder
+    @request.env['HTTP_REFERER'] = "/admin/birds/edit/#{bird.id}"
+
+    assert_difference('bird.image_holders.count', -1) do
+      post :unrelate, :id => image_holder.id, :resource => "Bird", :resource_id => bird.id
+    end
+  end
+
+end

data/test/app/controllers/admin/{invoices_controller_test.rb → resources/invoices_controller_test.rb.old}

@@ -36,7 +36,7 @@ class Admin::InvoicesControllerTest < ActionController::TestCase
       @invoice = { :number => "Invoice#0000001", :order_id => @order.id }
 
       assert_difference('Invoice.count') do
-        post :create, { :invoice => @invoice, :resource => "Order", :order_id => @order.id }
+        post :create, :invoice => @invoice, :resource => "Order", :order_id => @order.id, :_saveandassign => true
       end
 
       assert_response :redirect
@@ -58,20 +58,14 @@ class Admin::InvoicesControllerTest < ActionController::TestCase
 
   end
 
-  context "Unrelate" do
-
-    setup do
-      @invoice = Factory(:invoice)
-      @order = @invoice.order
-      @request.env['HTTP_REFERER'] = "/admin/orders/edit/#{@order.id}"
-    end
-
-    should "work for unrelate Invoice from Order" do
-      post :unrelate, :id => @invoice.id, :resource => 'Order', :resource_id => @order.id
-      assert @order.reload.invoice.nil?
-      assert_equal "Order successfully updated.", flash[:notice]
-    end
+  test "unrelate Invoice from Order" do
+    invoice = Factory(:invoice)
+    order = invoice.order
+    @request.env['HTTP_REFERER'] = "/admin/orders/edit/#{order.id}"
 
+    post :unrelate, :id => invoice.id, :resource => 'Order', :resource_id => order.id
+    assert order.reload.invoice.nil?
+    assert_equal "Order successfully updated.", flash[:notice]
   end
 
 end

data/test/app/controllers/admin/{pages_controller_test.rb → resources/pages_controller_test.rb.old}

@@ -20,11 +20,6 @@ class Admin::PagesControllerTest < ActionController::TestCase
     Factory(:page, :status => false)
   end
 
-  teardown do
-    Page.delete_all
-    TypusUser.delete_all
-  end
-
   test "get :index returns scoped results" do
     get :index
     assert_equal Page.all, assigns(:items)

data/test/app/controllers/admin/{posts_controller_test.rb → resources/posts_controller_test.rb.old}

@@ -4,8 +4,6 @@ require "test_helper"
 
   What's being tested here?
 
-    - CRUD: Create, read, update, destroy
-    - CRUD Extras: toggle
     - Filters
     - Forms
     - Overrides
@@ -22,99 +20,6 @@ class Admin::PostsControllerTest < ActionController::TestCase
     @post = Factory(:post)
   end
 
-  teardown do
-    Post.delete_all
-    TypusUser.delete_all
-  end
-
-  ##############################################################################
-  #
-  ##############################################################################
-
-  context "CRUD" do
-
-    should "render index" do
-      get :index
-      assert_response :success
-      assert_template 'index'
-    end
-
-    context "new" do
-
-      should "render" do
-        get :new
-        assert_response :success
-        assert_template 'new'
-      end
-
-      should "reject params which are not included in @resource.columns.map(&:name)" do
-        %w(chunky_bacon).each do |param|
-          get :new, {param => param}
-          assert_response :success
-          assert_template 'new'
-        end
-      end
-
-    end
-
-    should "create" do
-      assert_difference('Post.count') do
-        post :create, :post => @post.attributes
-        assert_response :redirect
-        assert_redirected_to "/admin/posts/edit/#{Post.last.id}"
-      end
-    end
-
-    should "render show" do
-      get :show, :id => @post.id
-      assert_response :success
-      assert_template 'show'
-    end
-
-    should "render edit" do
-      get :edit, :id => @post.id
-      assert_response :success
-      assert_template 'edit'
-    end
-
-    should "update" do
-      post :update, :id => @post.id, :post => { :title => 'Updated' }
-      assert_response :redirect
-      assert_redirected_to "/admin/posts/edit/#{@post.id}"
-    end
-
-  end
-
-  context "CRUD extras" do
-
-    setup do
-      @request.env['HTTP_REFERER'] = "/admin/posts"
-    end
-
-    context "toggle" do
-
-      should "work" do
-        assert !@post.published
-        get :toggle, :id => @post.id, :field => "published"
-
-        assert_response :redirect
-        assert_redirected_to @request.env["HTTP_REFERER"]
-        assert_equal "Post successfully updated.", flash[:notice]
-        assert @post.reload.published
-      end
-
-      should "render edit post when validation fails" do
-        @post.body = nil
-        @post.save(:validate => false)
-        get :toggle, :id => @post.id, :field => "published"
-        assert_response :success
-        assert_template "admin/resources/edit"
-      end
-
-    end
-
-  end
-
   context "Filters" do
 
     should "render index with accepted params" do
@@ -198,8 +103,8 @@ class Admin::PostsControllerTest < ActionController::TestCase
 
     # We have 3 inputs: 1 hidden which is the UTF8 stuff, one which is the 
     # Post#title and finally the submit button.
-    should "have 3 inputs" do
-      assert_select "form input", 3
+    should "have 5 inputs" do
+      assert_select "form input", 5
 
       # Post#title: Input
       assert_select 'label[for="post_title"]'
@@ -236,29 +141,6 @@ class Admin::PostsControllerTest < ActionController::TestCase
 
   end
 
-  context "Overwrite action_after_save" do
-
-    setup do
-      Typus::Resources.expects(:action_after_save).returns("index")
-      @post = Factory(:post)
-    end
-
-    should "create an item and redirect to index" do
-      assert_difference('Post.count') do
-        post :create, :post => @post.attributes
-        assert_response :redirect
-        assert_redirected_to :action => 'index'
-      end
-    end
-
-    should "update an item and redirect to index" do
-      post :update, :id => @post.id, :post => { :title => 'Updated' }
-      assert_response :redirect
-      assert_redirected_to :action => 'index'
-    end
-
-  end
-
   context "Formats" do
 
     should "render index and return xml" do
@@ -464,6 +346,8 @@ title;status
 
   end
 
+=begin
+  # TODO: This stuff has changed a lot! We need to rewrite the tests.
   context "Relationships (relate)" do
 
     setup do
@@ -523,6 +407,7 @@ title;status
     end
 
   end
+=end
 
   context "Views" do
 
@@ -693,7 +578,7 @@ title;status
       # assigned to the view.
       #
 
-      should "create new post and redirect to view" do
+      should_eventually "create new post and redirect to view" do
         assert_difference('Post.count') do
           post :create, :post => @post, :resource => "View"
         end
@@ -721,7 +606,7 @@ title;status
         @view = Factory(:view, :post => nil)
       end
 
-      should "create new post and redirect to view" do
+      should_eventually "create new post and redirect to view" do
         assert_difference('Post.count') do
           post :create, :post => @post, :resource => "View", :resource_id => @view.id
         end

data/test/app/controllers/admin/resources/trash_test.rb

@@ -0,0 +1,41 @@
+require "test_helper"
+
+=begin
+
+  What's being tested here?
+
+    - Typus::Controller::Trash
+
+=end
+
+class Admin::EntryTrashesControllerTest < ActionController::TestCase
+
+  setup do
+    admin_sign_in
+    @entry = Factory(:entry_trash)
+  end
+
+  test "get trash lists destroyed items" do
+    get :trash
+    assert assigns(:items).empty?
+
+    @entry.destroy
+    get :trash
+    assert_response :success
+    assert_template 'admin/resources/index'
+    assert_equal [@entry], assigns(:items)
+  end
+
+  test "get restore recovers an item from the trash" do
+    @request.env['HTTP_REFERER'] = "/admin/entries/trash"
+
+    @entry.destroy
+    get :restore, :id => @entry.id
+    assert_response :redirect
+    assert_redirected_to @request.env['HTTP_REFERER']
+
+    get :trash
+    assert assigns(:items).empty?
+  end
+
+end

data/test/app/controllers/admin/{typus_users_controller_test.rb → resources/typus_users_controller_test.rb}

@@ -56,9 +56,9 @@ class Admin::TypusUsersControllerTest < ActionController::TestCase
     end
 
     should "be able to update other users role" do
-      post :update, :id => @typus_user_editor.id, :typus_user => { :role => 'admin' }
+      post :update, :id => @typus_user_editor.id, :typus_user => { :role => 'admin' }, :_save => true
       assert_response :redirect
-      assert_redirected_to "/admin/typus_users/edit/#{@typus_user_editor.id}"
+      assert_redirected_to "/admin/typus_users"
       assert_equal "Typus user successfully updated.", flash[:notice]
     end
 
@@ -82,15 +82,17 @@ class Admin::TypusUsersControllerTest < ActionController::TestCase
     end
 
     should "be able to update his profile" do
-      post :update, :id => @typus_user.id, :typus_user => { :role => 'editor' }
+      post :update, :id => @typus_user.id, :typus_user => { :role => 'editor' }, :_continue => true
       assert_response :redirect
       assert_redirected_to "/admin/typus_users/edit/#{@typus_user.id}"
       assert_equal "Typus user successfully updated.", flash[:notice]
     end
 
     should "not be able to change his role" do
-      post :update, :id => @typus_user.id, :typus_user => { :role => 'admin' }
-      assert_response :unprocessable_entity
+      post :update, :id => @typus_user.id, :typus_user => { :role => 'admin' }, :_continue => true
+      assert_response :redirect
+      assert_redirected_to "/admin/typus_users/edit/#{@typus_user.id}"
+      assert_equal "editor", @typus_user.role
     end
 
     should "not be able to destroy his profile" do
@@ -141,10 +143,10 @@ class Admin::TypusUsersControllerTest < ActionController::TestCase
     end
 
     should "be able to update his profile" do
-      post :update, :id => @typus_user.id, :typus_user => { :role => 'designer', :email => 'designer@withafancydomain.com' }
+      post :update, :id => @typus_user.id, :typus_user => { :role => 'designer', :email => 'designer@withafancydomain.com' }, :_save => true
 
       assert_response :redirect
-      assert_redirected_to "/admin/typus_users/edit/#{@typus_user.id}"
+      assert_redirected_to "/admin/typus_users"
       assert_equal "Typus user successfully updated.", flash[:notice]
       assert_equal "designer@withafancydomain.com", assigns(:item).email
     end

data/test/app/controllers/admin/{views_controller_test.rb → resources/views_controller_test.rb.old}

@@ -17,10 +17,6 @@ class Admin::ViewsControllerTest < ActionController::TestCase
     Factory(:view)
   end
 
-  teardown do
-    reset_session
-  end
-
   should_eventually "get :index returns only views on the current_context" do
     get :index
     assert_response :success

data/test/app/controllers/admin/resources_controller_test.rb

@@ -0,0 +1,102 @@
+require "test_helper"
+
+=begin
+
+  What's being tested here?
+
+    - CRUD
+
+=end
+
+class Admin::EntriesControllerTest < ActionController::TestCase
+
+  setup do
+    admin_sign_in
+    @entry = Factory(:entry)
+  end
+
+  test "get index" do
+    get :index
+    assert_response :success
+    assert_template 'index'
+  end
+
+  test "get new" do
+    get :new
+    assert_response :success
+    assert_template 'new'
+  end
+
+  test "get new and reject params which are not included in @resource.columns.map(&:name)" do
+    %w(chunky_bacon).each do |param|
+      get :new, { param => param }
+      assert_response :success
+      assert_template 'new'
+    end
+  end
+
+  test "post create and redirect to index" do
+    assert_difference('Entry.count') do
+      post :create, :entry => @entry.attributes, :_save => true
+      assert_response :redirect
+      assert_redirected_to "/admin/entries"
+    end
+  end
+
+  test "post create and redirect to add new" do
+    assert_difference('Entry.count') do
+      post :create, :entry => @entry.attributes, :_addanother => true
+      assert_response :redirect
+      assert_redirected_to "/admin/entries/new"
+    end
+  end
+
+  test "post create and continue editing" do
+    assert_difference('Entry.count') do
+      post :create, :entry => @entry.attributes, :_continue => true
+      assert_response :redirect
+      assert_redirected_to "/admin/entries/edit/#{Entry.last.id}"
+    end
+  end
+
+  test "get show" do
+    get :show, :id => @entry.id
+    assert_response :success
+    assert_template 'show'
+  end
+
+  test "get edit" do
+    get :edit, :id => @entry.id
+    assert_response :success
+    assert_template 'edit'
+  end
+
+  test "post update and redirect to index" do
+    post :update, :id => @entry.id, :entry => { :title => 'Updated' }, :_save => true
+    assert_response :redirect
+    assert_redirected_to "/admin/entries"
+  end
+
+  test "get toggle" do
+    @request.env['HTTP_REFERER'] = "/admin/entries"
+
+    assert !@entry.published
+    get :toggle, :id => @entry.id, :field => "published"
+
+    assert_response :redirect
+    assert_redirected_to @request.env["HTTP_REFERER"]
+    assert_equal "Entry successfully updated.", flash[:notice]
+    assert @entry.reload.published
+  end
+
+  test "get toggle redirects to edit because validation has failed" do
+    @request.env['HTTP_REFERER'] = "/admin/entries"
+
+    @entry.content = nil
+    @entry.save(:validate => false)
+    get :toggle, :id => @entry.id, :field => "published"
+    assert_response :success
+    assert_template "admin/resources/edit"
+  end
+
+end

data/test/app/controllers/admin/session_controller_test.rb

@@ -10,14 +10,16 @@ require "test_helper"
 
 class Admin::SessionControllerTest < ActionController::TestCase
 
-  context "Setup" do
-
-    should "redirect_to_new_admin_account_when_no_admin_users" do
-      get :new
-      assert_response :redirect
-      assert_redirected_to new_admin_account_path
-    end
+  test "get new redirects to new_admin_account_path when no admin users" do
+    get :new
+    assert_response :redirect
+    assert_redirected_to new_admin_account_path
+  end
 
+  test "get new always sets locale to Typus::I18n.default_locale" do
+    I18n.locale = :jp
+    get :new
+    assert_equal :en, I18n.locale
   end
 
   context "With users" do

data/test/app/helpers/admin/base_helper_test.rb

@@ -34,7 +34,7 @@ class Admin::BaseHelperTest < ActiveSupport::TestCase
 
         should "render a partial with the user name" do
           admin_user.stubs(:can?).with('edit', 'TypusUser').returns(false)
-          assert_equal ["admin/helpers/base/login_info"], login_info
+          assert_equal ["helpers/admin/resources/base/login_info"], login_info
         end
 
       end
@@ -47,7 +47,7 @@ class Admin::BaseHelperTest < ActiveSupport::TestCase
           admin_user.stubs(:can?).with('edit', 'TypusUser').returns(true)
           self.stubs(:link_to).with("Admin", link_options).returns(%(<a href="/admin/typus_users/edit/1">Admin</a>))
 
-          assert_equal ["admin/helpers/base/login_info"], login_info
+          assert_equal ["helpers/admin/resources/base/login_info"], login_info
         end
 
       end
@@ -57,13 +57,13 @@ class Admin::BaseHelperTest < ActiveSupport::TestCase
   end
 
   test "header returns a partial" do
-    assert_equal ["admin/helpers/base/header"], header
+    assert_equal ["helpers/admin/resources/base/header"], header
   end
 
   test "display_flash_message is displayed" do
     message = { :test => "This is the message." }
     output = display_flash_message(message)
-    expected = ["admin/helpers/base/flash_message",
+    expected = ["helpers/admin/resources/base/flash_message",
                 { :flash_type => :test, :message => { :test => "This is the message." } }]
     assert_equal expected, output
   end