comfortable_mexican_sofa 1.9.3 → 1.10.0

data/test/controllers/{cms_admin → admin/cms}/layouts_controller_test.rb

@@ -1,6 +1,6 @@
-require_relative '../../test_helper'
+require_relative '../../../test_helper'
 
-class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
+class Admin::Cms::LayoutsControllerTest < ActionController::TestCase
 
   def test_get_index
     get :index, :site_id => cms_sites(:default)
@@ -23,8 +23,8 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
     assert assigns(:layout)
     assert_equal '{{ cms:page:content:text }}', assigns(:layout).content
     assert_template :new
-    assert_select "form[action=/cms-admin/sites/#{site.id}/layouts]"
-    assert_select "form[action='/cms-admin/sites/#{site.id}/files?ajax=true']"
+    assert_select "form[action=/admin/sites/#{site.id}/layouts]"
+    assert_select "form[action='/admin/sites/#{site.id}/files?ajax=true']"
   end
   
   def test_get_new_with_parent
@@ -42,7 +42,7 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
     assert_response :success
     assert assigns(:layout)
     assert_template :edit
-    assert_select "form[action=/cms-admin/sites/#{layout.site.id}/layouts/#{layout.id}]"
+    assert_select "form[action=/admin/sites/#{layout.site.id}/layouts/#{layout.id}]"
   end
 
   def test_get_edit_failure

data/test/controllers/{cms_admin → admin/cms}/pages_controller_test.rb

@@ -1,6 +1,6 @@
-require_relative '../../test_helper'
+require_relative '../../../test_helper'
 
-class CmsAdmin::PagesControllerTest < ActionController::TestCase
+class Admin::Cms::PagesControllerTest < ActionController::TestCase
 
   def test_get_index
     get :index, :site_id => cms_sites(:default)
@@ -41,9 +41,9 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert assigns(:page)
     assert_equal cms_layouts(:default), assigns(:page).layout
     assert_template :new
-    assert_select "form[action=/cms-admin/sites/#{site.id}/pages]"
-    assert_select "select[data-url=/cms-admin/sites/#{site.id}/pages/0/form_blocks]"
-    assert_select "form[action='/cms-admin/sites/#{site.id}/files?ajax=true']"
+    assert_select "form[action=/admin/sites/#{site.id}/pages]"
+    assert_select "select[data-url=/admin/sites/#{site.id}/pages/0/form_blocks]"
+    assert_select "form[action='/admin/sites/#{site.id}/files?ajax=true']"
   end
 
   def test_get_new_with_field_datetime
@@ -202,8 +202,8 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert_response :success
     assert assigns(:page)
     assert_template :edit
-    assert_select "form[action=/cms-admin/sites/#{page.site.id}/pages/#{page.id}]"
-    assert_select "select[data-url=/cms-admin/sites/#{page.site.id}/pages/#{page.id}/form_blocks]"
+    assert_select "form[action=/admin/sites/#{page.site.id}/pages/#{page.id}]"
+    assert_select "select[data-url=/admin/sites/#{page.site.id}/pages/#{page.id}/form_blocks]"
   end
 
   def test_get_edit_failure
@@ -404,7 +404,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     Cms::Layout.destroy_all
     get :new, :site_id => cms_sites(:default)
     assert_response :redirect
-    assert_redirected_to new_cms_admin_site_layout_path(cms_sites(:default))
+    assert_redirected_to new_admin_cms_site_layout_path(cms_sites(:default))
     assert_equal 'No Layouts found. Please create one.', flash[:error]
   end
 
@@ -413,7 +413,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     page = cms_pages(:default)
     get :edit, :site_id => page.site, :id => page
     assert_response :redirect
-    assert_redirected_to new_cms_admin_site_layout_path(page.site)
+    assert_redirected_to new_admin_cms_site_layout_path(page.site)
     assert_equal 'No Layouts found. Please create one.', flash[:error]
   end
 

data/test/controllers/{cms_admin → admin/cms}/revisions_controller_test.rb

@@ -1,6 +1,6 @@
-require_relative '../../test_helper'
+require_relative '../../../test_helper'
 
-class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
+class Admin::Cms::RevisionsControllerTest < ActionController::TestCase
   
   def test_get_index_for_layouts
     get :index, :site_id => cms_sites(:default), :layout_id => cms_layouts(:default)
@@ -57,7 +57,7 @@ class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
   def test_get_show_for_bad_type
     get :show, :site_id => cms_sites(:default), :snippet_id => 'invalid', :id => cms_revisions(:snippet)
     assert_response :redirect
-    assert_redirected_to cms_admin_path
+    assert_redirected_to admin_cms_path
     assert_equal 'Record Not Found', flash[:error]
   end
   
@@ -66,7 +66,7 @@ class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
     get :show, :site_id => site, :layout_id => cms_layouts(:default), :id => 'invalid'
     assert_response :redirect
     assert assigns(:record)
-    assert_redirected_to edit_cms_admin_site_layout_path(site, assigns(:record))
+    assert_redirected_to edit_admin_cms_site_layout_path(site, assigns(:record))
     assert_equal 'Revision Not Found', flash[:error]
   end
   
@@ -75,7 +75,7 @@ class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
     get :show, :site_id => site, :page_id => cms_pages(:default), :id => 'invalid'
     assert_response :redirect
     assert assigns(:record)
-    assert_redirected_to edit_cms_admin_site_page_path(site, assigns(:record))
+    assert_redirected_to edit_admin_cms_site_page_path(site, assigns(:record))
     assert_equal 'Revision Not Found', flash[:error]
   end
   
@@ -84,7 +84,7 @@ class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
     get :show, :site_id => site, :snippet_id => cms_snippets(:default), :id => 'invalid'
     assert_response :redirect
     assert assigns(:record)
-    assert_redirected_to edit_cms_admin_site_snippet_path(site, assigns(:record))
+    assert_redirected_to edit_admin_cms_site_snippet_path(site, assigns(:record))
     assert_equal 'Revision Not Found', flash[:error]
   end
   
@@ -94,7 +94,7 @@ class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
     assert_difference 'layout.revisions.count' do 
       put :revert, :site_id => cms_sites(:default), :layout_id => layout, :id => cms_revisions(:layout)
       assert_response :redirect
-      assert_redirected_to edit_cms_admin_site_layout_path(layout.site, layout)
+      assert_redirected_to edit_admin_cms_site_layout_path(layout.site, layout)
       assert_equal 'Content Reverted', flash[:success]
       
       layout.reload
@@ -110,7 +110,7 @@ class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
     assert_difference 'page.revisions.count' do
       put :revert, :site_id => cms_sites(:default), :page_id => page, :id => cms_revisions(:page)
       assert_response :redirect
-      assert_redirected_to edit_cms_admin_site_page_path(page.site, page)
+      assert_redirected_to edit_admin_cms_site_page_path(page.site, page)
       assert_equal 'Content Reverted', flash[:success]
       
       page.reload
@@ -127,7 +127,7 @@ class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
     assert_difference 'snippet.revisions.count' do
       put :revert, :site_id => cms_sites(:default), :snippet_id => snippet, :id => cms_revisions(:snippet)
       assert_response :redirect
-      assert_redirected_to edit_cms_admin_site_snippet_path(snippet.site, snippet)
+      assert_redirected_to edit_admin_cms_site_snippet_path(snippet.site, snippet)
       assert_equal 'Content Reverted', flash[:success]
       
       snippet.reload

data/test/controllers/{cms_admin → admin/cms}/sites_controller_test.rb

@@ -1,6 +1,6 @@
-require_relative '../../test_helper'
+require_relative '../../../test_helper'
 
-class CmsAdmin::SitesControllerTest < ActionController::TestCase
+class Admin::Cms::SitesControllerTest < ActionController::TestCase
 
   def test_get_index
     get :index
@@ -22,7 +22,7 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
     assert assigns(:site)
     assert_equal 'test.host', assigns(:site).hostname
     assert_template :new
-    assert_select 'form[action=/cms-admin/sites]'
+    assert_select 'form[action=/admin/sites]'
   end
 
   def test_get_edit
@@ -31,7 +31,7 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
     assert_response :success
     assert assigns(:site)
     assert_template :edit
-    assert_select "form[action=/cms-admin/sites/#{site.id}]"
+    assert_select "form[action=/admin/sites/#{site.id}]"
   end
 
   def test_get_edit_failure
@@ -50,7 +50,7 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
       }
       assert_response :redirect
       site = Cms::Site.last
-      assert_redirected_to cms_admin_site_layouts_path(site)
+      assert_redirected_to admin_cms_site_layouts_path(site)
       assert_equal 'Site created', flash[:success]
     end
   end

data/test/controllers/{cms_admin → admin/cms}/snippets_controller_test.rb

@@ -1,6 +1,6 @@
-require_relative '../../test_helper'
+require_relative '../../../test_helper'
 
-class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
+class Admin::Cms::SnippetsControllerTest < ActionController::TestCase
 
   def test_get_index
     get :index, :site_id => cms_sites(:default)
@@ -40,8 +40,8 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
     assert_response :success
     assert assigns(:snippet)
     assert_template :new
-    assert_select "form[action=/cms-admin/sites/#{site.id}/snippets]"
-    assert_select "form[action='/cms-admin/sites/#{site.id}/files?ajax=true']"
+    assert_select "form[action=/admin/sites/#{site.id}/snippets]"
+    assert_select "form[action='/admin/sites/#{site.id}/files?ajax=true']"
   end
 
   def test_get_edit
@@ -50,7 +50,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
     assert_response :success
     assert assigns(:snippet)
     assert_template :edit
-    assert_select "form[action=/cms-admin/sites/#{snippet.site.id}/snippets/#{snippet.id}]"
+    assert_select "form[action=/admin/sites/#{snippet.site.id}/snippets/#{snippet.id}]"
   end
   
   def test_get_edit_with_params

data/test/controllers/{cms_content_controller_test.rb → cms/content_controller_test.rb}

@@ -1,6 +1,6 @@
-require_relative '../test_helper'
+require_relative '../../test_helper'
 
-class CmsContentControllerTest < ActionController::TestCase
+class Cms::ContentControllerTest < ActionController::TestCase
 
   def test_render_page
     get :render_html, :cms_path => ''
@@ -23,7 +23,7 @@ class CmsContentControllerTest < ActionController::TestCase
   end
   
   def test_render_page_with_app_layout
-    cms_layouts(:default).update_columns(:app_layout => 'cms_admin')
+    cms_layouts(:default).update_columns(:app_layout => 'admin/cms')
     get :render_html, :cms_path => ''
     assert_response :success
     assert assigns(:cms_page)
@@ -162,7 +162,7 @@ class CmsContentControllerTest < ActionController::TestCase
   def test_render_sitemap
     get :render_sitemap, :format => :xml
     assert_response :success
-    assert_match '<loc>http://test.host/child-page</loc>', response.body
+    assert_match '<loc>//test.host/child-page</loc>', response.body
   end
 
   def test_render_sitemap_with_path
@@ -172,17 +172,16 @@ class CmsContentControllerTest < ActionController::TestCase
     get :render_sitemap, :cms_path => site.path, :format => :xml
     assert_response :success
     assert_equal cms_sites(:default), assigns(:cms_site)
-    assert_match '<loc>http://test.host/en/child-page</loc>', response.body
+    assert_match '<loc>//test.host/en/child-page</loc>', response.body
   end
   
   def test_render_sitemap_with_path_invalid_with_single_site
     site = cms_sites(:default)
     site.update_columns(:path => 'en')
     
-    get :render_sitemap, :cms_path => 'fr', :format => :xml
-    assert_response :success
-    assert_equal cms_sites(:default), assigns(:cms_site)
-    assert_match '<loc>http://test.host/en/child-page</loc>', response.body
+    assert_exception_raised ActionController::RoutingError, 'Site Not Found' do
+      get :render_sitemap, :cms_path => 'fr', :format => :xml
+    end
   end
 
 end

data/test/fixtures/generators/cms/routes.rb

@@ -0,0 +1,8 @@
+Test::Application.routes.draw do
+
+  ComfortableMexicanSofa::Routing.admin :path => '/admin'
+
+  # Make sure this routeset is defined last
+  ComfortableMexicanSofa::Routing.content :path => '/', :sitemap => false
+
+end

data/test/fixtures/generators/scaffold/controller.rb

@@ -0,0 +1,62 @@
+class Admin::FoosController < Admin::Cms::BaseController
+
+  before_action :build_foo,  :only => [:new, :create]
+  before_action :load_foo,   :only => [:show, :edit, :update, :destroy]
+
+  def index
+    @foos = Foo.page(params[:page])
+  end
+
+  def show
+    render
+  end
+
+  def new
+    render
+  end
+
+  def edit
+    render
+  end
+
+  def create
+    @foo.save!
+    flash[:success] = 'Foo created'
+    redirect_to :action => :show, :id => @foo
+  rescue ActiveRecord::RecordInvalid
+    flash.now[:error] = 'Failed to create Foo'
+    render :action => :new
+  end
+
+  def update
+    @foo.update_attributes!(foo_params)
+    flash[:success] = 'Foo updated'
+    redirect_to :action => :show, :id => @foo
+  rescue ActiveRecord::RecordInvalid
+    flash.now[:error] = 'Failed to update Foo'
+    render :action => :edit
+  end
+
+  def destroy
+    @foo.destroy
+    flash[:success] = 'Foo deleted'
+    redirect_to :action => :index
+  end
+
+protected
+
+  def build_foo
+    @foo = Foo.new(foo_params)
+  end
+
+  def load_foo
+    @foo = Foo.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    flash[:error] = 'Foo not found'
+    redirect_to :action => :index
+  end
+
+  def foo_params
+    params.fetch(:foo, {}).permit(:bar)
+  end
+end

data/test/fixtures/generators/scaffold/migration.rb

@@ -0,0 +1,10 @@
+class CreateFoos < ActiveRecord::Migration
+
+  def change
+    create_table :foos do |t|
+      t.string :bar
+      t.timestamps
+    end
+  end
+
+end

data/test/fixtures/generators/scaffold/model.rb

@@ -0,0 +1,21 @@
+class Foo < ActiveRecord::Base
+
+  # -- Relationships --------------------------------------------------------
+
+
+  # -- Callbacks ------------------------------------------------------------
+
+
+  # -- Validations ----------------------------------------------------------
+
+
+  # -- Scopes ---------------------------------------------------------------
+
+
+  # -- Class Methods --------------------------------------------------------
+
+
+  # -- Instance Methods -----------------------------------------------------
+
+
+end

data/test/fixtures/generators/scaffold/routes.rb

@@ -0,0 +1,7 @@
+Test::Application.routes.draw do
+
+  namespace :admin do
+    resources :foos
+  end
+
+end

data/test/fixtures/generators/scaffold/tests/controller.rb

@@ -0,0 +1,98 @@
+require_relative '../../test_helper'
+
+class Admin::FoosControllerTest < ActionController::TestCase
+
+  def setup
+    # TODO: login as admin user
+    @foo = foos(:default)
+  end
+
+  def test_get_index
+    get :index
+    assert_response :success
+    assert assigns(:foos)
+    assert_template :index
+  end
+
+  def test_get_show
+    get :show, :id => @foo
+    assert_response :success
+    assert assigns(:foo)
+    assert_template :show
+  end
+
+  def test_get_show_failure
+    get :show, :id => 'invalid'
+    assert_response :redirect
+    assert_redirected_to :action => :index
+    assert_equal 'Foo not found', flash[:error]
+  end
+
+  def test_get_new
+    get :new
+    assert_response :success
+    assert assigns(:foo)
+    assert_template :new
+    assert_select 'form[action=/admin/foos]'
+  end
+
+  def test_get_edit
+    get :edit, :id => @foo
+    assert_response :success
+    assert assigns(:foo)
+    assert_template :edit
+    assert_select "form[action=/admin/foos/#{@foo.id}]"
+  end
+
+  def test_creation
+    assert_difference 'Foo.count' do
+      post :create, :foo => {
+        :bar => 'test bar',
+      }
+      foo = Foo.last
+      assert_response :redirect
+      assert_redirected_to :action => :show, :id => foo
+      assert_equal 'Foo created', flash[:success]
+    end
+  end
+
+  def test_creation_failure
+    assert_no_difference 'Foo.count' do
+      post :create, :foo => { }
+      assert_response :success
+      assert_template :new
+      assert_equal 'Failed to create Foo', flash[:error]
+    end
+  end
+
+  def test_update
+    put :update, :id => @foo, :foo => {
+      :bar => 'Updated'
+    }
+    assert_response :redirect
+    assert_redirected_to :action => :show, :id => @foo
+    assert_equal 'Foo updated', flash[:success]
+    @foo.reload
+    assert_equal 'Updated', @foo.bar
+  end
+
+  def test_update_failure
+    put :update, :id => @foo, :foo => {
+      :bar => ''
+    }
+    assert_response :success
+    assert_template :edit
+    assert_equal 'Failed to update Foo', flash[:error]
+    @foo.reload
+    refute_equal '', @foo.bar
+  end
+
+  def test_destroy
+    assert_difference 'Foo.count', -1 do
+      delete :destroy, :id => @foo
+      assert_response :redirect
+      assert_redirected_to :action => :index
+      assert_equal 'Foo deleted', flash[:success]
+    end
+  end
+end