liquid_cms 0.2.2.0 → 0.3.0

data/test/functional/assets_controller_test.rb

@@ -7,182 +7,81 @@ class Cms::AssetsControllerTest < ActionController::TestCase
   end
 
   context "actions" do
-    context "new" do
-      should "show the new form" do
-        get :new
-        assert_select 'div.text', false
-        assert_select 'div.file .hint', 'Upload an asset file.'
-      end
-
-      should "populate the new asset with tag and meta details" do
-        asset = Factory(:image_asset, :context => @company, :tag_list => 'test', :meta_data => [{:name => 'field1', :value => 'test1'}, {:name => 'field2', :value => 'test2'}], :custom_width => 200, :custom_height => 100)
-        get :new, :tag => asset.tag_list.to_s
-        assert_response :success
-
-        new_asset = assigns(:asset)
-        assert_equal 'test', new_asset.tag_list.to_s
-        assert_equal 2, new_asset.meta_data.length
-        # values are removed from new assets
-        assert_equal 'field1', new_asset.meta_data[0][:name]
-        assert_equal '', new_asset.meta_data[0][:value]
-        assert_equal 'field2', new_asset.meta_data[1][:name]
-        assert_equal '', new_asset.meta_data[1][:value]
-        assert_equal 200, new_asset.custom_width
-        assert_equal 100, new_asset.custom_height
-
-        assert_select '#meta_fields li', new_asset.meta_data.length
-      end
-
-      should "not populate the new asset with tag and meta details" do
-        asset = Factory(:image_asset, :context => @company, :tag_list => 'test', :meta_data => [{:name => 'field1', :value => 'test1'}, {:name => 'field2', :value => 'test2'}])
-        get :new, :tag => 'unknown'
-        assert_response :success
-
-        new_asset = assigns(:asset)
-        assert_equal 'unknown', new_asset.tag_list.to_s
-        assert_nil new_asset.meta_data
-      end
+    should "show the image asset" do
+      asset = Factory(:image_asset, :context => @company)
+      get :show, :id => asset
+      assert_response :success
+      assert_select '#content img'
+      assert_select 'p', :text => /Open/, :count => 0
+      assert_select 'p', /Filesize/
+      assert_select 'p', /Last Updated/
     end
 
-    context "create" do
-      teardown do
-        cleanup_assets
-      end
+    should "show the non-image asset" do
+      asset = Factory(:pdf_asset, :context => @company)
+      get :show, :id => asset
+      assert_response :success
+      assert_select '#content img', false
+      assert_select 'p', :text => /Open/, :count => 1
+      assert_select 'p', /Filesize/
+      assert_select 'p', /Last Updated/
+    end
 
-      should "create an asset" do
-        asset_file = asset_file('new_test.pdf')
-        setup_asset asset_file
+    should "edit asset" do
+      asset = Factory(:pdf_asset, :context => @company)
+      assert_equal 'test.pdf', asset.asset_file_name
 
-        post :create, :cms_asset => {:asset => ActionController::TestUploadedFile.new(asset_file), :meta => {'new_0' => {:name => 'key_a', :value => 'test'}, 'new_1' => {:name => 'key_b', :value => 'test'}} }
-        assert_response :redirect
-        assert_redirected_to cms_root_path
+      new_asset_file = 'new_test.pdf'
+      setup_asset new_asset_file
 
-        asset = assigns(:asset)
-        assert_equal 2, asset.meta_data.length
-      end
-    end
+      put :update, :id => asset, :cms_asset => {:asset => fixture_file_upload(File.join(ASSET_PATH, new_asset_file))}
+      assert_response :redirect
+      assert_redirected_to cms_root_path
+
+      # check that the file name updated
+      assert_equal new_asset_file, asset.reload.asset_file_name
 
-    context "show" do
-      should "show an image asset" do
-        asset = Factory(:image_asset, :context => @company)
-        get :show, :id => asset
-        assert_response :success
-        assert_select '#content img'
-        assert_select 'p', :text => /Open/, :count => 0
-        assert_select 'p', /Filesize/
-        assert_select 'p', /Last Updated/
-      end
-
-      should "show a non-image asset" do
-        asset = Factory(:pdf_asset, :context => @company)
-        get :show, :id => asset
-        assert_response :success
-        assert_select '#content img', false
-        assert_select 'p', :text => /Open/, :count => 1
-        assert_select 'p', /Filesize/
-        assert_select 'p', /Last Updated/
-      end
+      cleanup_assets
     end
 
-    context "edit" do
-      should "show form for an editable asset with a textarea" do
-        Cms::Asset.any_instance.stubs(:asset).returns(stub(:url => 'test.com', :to_file => stub(:read => 'test contents')))
-        asset = Factory(:js_asset, :context => @company)
-
-        get :edit, :id => asset.id
-        assert_select 'div.text', true
-        assert_select 'p.break', :text => 'or edit the contents...', :count => 1
-        assert_select 'div.file .hint', 'An existing file has been uploaded.  Upload a new file to replace it.'
-      end
-
-      should "show form for an editable asset without a textarea" do
-        asset = Factory(:pdf_asset, :context => @company)
-
-        get :edit, :id => asset.id
-        assert_select 'div.text', false
-        assert_select 'p.break', :text => 'or edit the contents...', :count => 0
-        assert_select 'div.file .hint', 'An existing file has been uploaded.  Upload a new file to replace it.'
-      end
+    should "destroy asset via HTML :DELETE" do
+      asset = Factory(:pdf_asset, :context => @company)
+      assert_not_nil @company.assets.find_by_id(asset.id)
+
+      delete :destroy, :id => asset
+      assert_response :redirect
+      assert_redirected_to cms_root_path
+      assert_nil @company.assets.find_by_id(asset.id)
     end
 
-    context "update" do
-      teardown do
-        cleanup_assets
-      end
-
-      should "upload a new asset file" do
-        asset = Factory(:pdf_asset, :context => @company)
-        assert_equal 'test.pdf', asset.asset_file_name
-
-        new_asset_file = asset_file('new_test.pdf')
-        setup_asset new_asset_file
-
-        put :update, :id => asset, :cms_asset => {:asset => ActionController::TestUploadedFile.new(new_asset_file)}
-        assert_response :redirect
-        assert_redirected_to edit_cms_asset_path(asset)
-        assert_equal 'The asset has been updated.', flash[:notice]
-
-        # check that the file name updated
-        assert_equal File.basename(new_asset_file), asset.reload.asset_file_name
-      end
-
-      should "modify the contents of a non-editable asset file" do
-        asset = Factory(:pdf_asset, :context => @company)
-
-        # file contents are ignored for non-editable assets
-        put :update, :id => asset, :cms_asset => {:file_content => 'new content'}
-        assert_response :redirect
-        assert_redirected_to edit_cms_asset_path(asset)
-        assert_equal 'The asset has been updated.', flash[:notice]
-      end
-
-      context "update editable content" do
-        setup do
-          @asset = Factory(:js_asset, :context => @company)
-
-          asset_file = asset_file(@asset.asset_file_name)
-          setup_asset asset_file
-
-          Cms::Asset.any_instance.stubs(:asset => stub(:path => asset_file))
-          Cms::Asset.any_instance.expects(:file_content=).with('new content').returns('new content')
-        end
-
-        teardown do
-          assert_equal 'The asset has been updated.', flash[:notice]
-          @asset.reload
-          assert_not_nil @asset.meta_data
-          assert_equal 2, @asset.meta.length
-        end
-
-        should "modify the contents of an editable asset file and it's meta data" do
-          assert_nil @asset.meta_data
-          assert_equal 0, @asset.meta.length
-
-          put :update, :id => @asset, :cms_asset => {:file_content => 'new content', :meta => {'new_0' => {:name => 'key_a', :value => 'test'}, 'new_1' => {:name => 'key_b', :value => 'test'}}}
-          assert_response :redirect
-          assert_redirected_to edit_cms_asset_path(@asset)
-        end
-
-        should "update via XHR" do
-          xhr :put, :update, :id => @asset, :cms_asset => {:file_content => 'new content', :meta => {'new_0' => {:name => 'key_a', :value => 'test'}, 'new_1' => {:name => 'key_b', :value => 'test'}}}
-          assert_response :success
-        end
-      end
+    should "destroy asset via XHR :DELETE" do
+      asset = Factory(:pdf_asset, :context => @company)
+      assert_not_nil @company.assets.find_by_id(asset.id)
+
+      xhr :delete, :destroy, :id => asset
+      assert_response :success
+      assert_nil @company.assets.find_by_id(asset.id)
     end
+  end
 
-    context "destroy" do
-      setup do
-        @asset = Factory(:pdf_asset, :context => @company)
-      end
+protected
+  def setup_asset(file_name)
+    FileUtils.mkdir_p asset_path
+    FileUtils.touch asset_file(file_name)
+  end
 
-      should "destroy asset via HTML :DELETE" do
-        assert_not_nil @company.assets.find_by_id(@asset.id)
+  def cleanup_assets
+    FileUtils.rm_rf TestConfig.paperclip_test_root
+    FileUtils.rm_rf Rails.root.join('public', 'cms', 'assets')
+  end
 
-        delete :destroy, :id => @asset
-        assert_response :redirect
-        assert_redirected_to cms_root_path
-        assert_nil @company.assets.find_by_id(@asset.id)
-      end
-    end
+  ASSET_PATH = 'assets'
+
+  def asset_path
+    File.join(TestConfig.paperclip_test_root, ASSET_PATH)
+  end
+
+  def asset_file(file_name)
+    File.join(asset_path, file_name)
   end
 end

data/test/functional/main_controller_test.rb

@@ -13,41 +13,11 @@ class Cms::MainControllerTest < ActionController::TestCase
 
       get :index
       assert_response :success
-      assert_select "#assets p.preview", true
       assert_select "li#cms_asset_#{img_asset.id} a", img_asset.asset_file_name
       assert_select "li#cms_asset_#{img_asset.id} div.asset_image"
       assert_select "li#cms_asset_#{pdf_asset.id} a", pdf_asset.asset_file_name
       assert_select "li#cms_asset_#{pdf_asset.id} div.asset_image", false
     end
-
-    should "not should the preview link if no images have been uploaded" do
-      pdf_asset = Factory(:pdf_asset, :context => @company)
-
-      get :index
-      assert_response :success
-      assert_select "#assets p.preview", false
-    end
-
-    should "show no tags" do
-      Factory(:image_asset, :context => @company)
-
-      get :index
-      assert_response :success
-      assert_select 'li.group.tagged', false
-      assert_select 'li.group.untagged', true
-      assert_select 'li.group.untagged h4', false
-    end
-    
-    should "show tags" do
-      tagged = Factory(:image_asset, :context => @company, :tag_list => 'test, this')
-      Factory(:image_asset, :context => @company)
-
-      get :index
-      assert_response :success
-      assert_select 'li.group.tagged', tagged.tags.count
-      assert_select 'li.group.untagged'
-      assert_select 'li.group.untagged h4', 'Untagged'
-    end
   end
 
   context "permission access" do

data/test/functional/pages_controller_test.rb

@@ -70,25 +70,12 @@ class Cms::PagesControllerTest < ActionController::TestCase
       assert_template 'edit'
     end
 
-    context "update" do
-      setup do
-        @page = @company.pages.first
-      end
-
-      should "update via HTTP" do
-        put :update, :id => @page.id, :cms_page => {:slug => '', :published => false}
-        assert_response :redirect
-        assert_equal true, assigns(:page).errors.empty?
-        assert_redirected_to edit_cms_page_path(@page)
-        assert_equal 'The page has been updated.', flash[:notice]
-      end
-
-      should "update via XHR" do
-        xhr :put, :update, :id => @page.id, :cms_page => {:slug => '', :published => false}
-        assert_response :success
-        assert_equal true, assigns(:page).errors.empty?
-        assert_equal 'The page has been updated.', flash[:notice]
-      end
+    should "update a page" do
+      put :update, :id => @company.pages.first.id, :cms_page => {:slug => '', :published => false}
+      assert_response :redirect
+      assert_equal true, assigns(:page).errors.empty?
+      assert_equal 'The page has been updated.', flash[:notice]
+      assert_redirected_to edit_cms_page_path
     end
 
     should "destroy a page via HTML :DELETE" do
@@ -101,50 +88,5 @@ class Cms::PagesControllerTest < ActionController::TestCase
       xhr :delete, :destroy, :id => @company.pages.first.id
       assert_response :success
     end
-
-    context "search" do
-      setup do
-        # the company already has a home page created
-        @page1 = @company.pages.first
-        # so we'll create a second page
-        @page2 = Factory.create :page, :context => @company, :content => 'add search keywords - page page page'
-      end
-
-      should "show no results via :GET" do
-        get :search
-        assert_response :success
-        assert_select '#content form'
-        assert_select '#search_results p', false
-        assert_select '#search_results ul', false
-      end
-
-      should "show a message with an empty search via :POST" do
-        post :search, :search => ''
-        assert_response :success
-        assert_select '#content form'
-        assert_select '#search_results p', 'No matching pages were found.'
-        assert_select '#search_results ul', false
-      end
-
-      should "show results via :POST" do
-        post :search, :search => 'page'
-        assert_response :success
-        assert_select '#search_results p', '2 pages found.'
-        assert_select '#search_results ul', true
-        assert_select '#search_results li', 2
-        assert_select '#search_results li', "#{@page2} - 3 matches"
-        assert_select '#search_results li', "#{@page1} - 1 match"
-      end
-
-      should "show search limit" do
-        (1..40).each do |i|
-          Factory.create :page, :context => @company, :name => "test#{i}", :slug => "/test#{i}", :content => 'page'
-        end
-
-        post :search, :search => 'page'
-        assert_response :success
-        assert_select '#search_results p', 'Search results have been limited to 40 pages. &nbsp;Use a more exact search term to refine your results.'
-      end
-    end
   end
 end

data/test/integration/pages_test.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/../test_helpers/cache_helper'
 
 class Cms::PagesTest < ActionController::IntegrationTest
 
@@ -12,6 +11,13 @@ class Cms::PagesTest < ActionController::IntegrationTest
     stub_paperclip!
   end
   
+  context "routes" do
+    should "recognize routes" do
+      assert_routing '/', :controller => 'cms/pages', :action => 'load'
+      assert_routing '', :controller => 'cms/pages', :action => 'load'
+    end
+  end
+
   context "page title" do
     should "show the page title from a child template" do
       layout = Factory(:page, :slug => nil, :published => false, :content => read_fixture('layout.liquid'), :context => @company)
@@ -38,12 +44,12 @@ class Cms::PagesTest < ActionController::IntegrationTest
 
         get '/'
         assert_response :success
-        assert_equal assigns(:page), root
+        assert_equal root, assigns(:page)
         assert_equal 'This is the home page', response.body
 
         get ''
         assert_response :success
-        assert_equal assigns(:page), root
+        assert_equal root, assigns(:page)
         assert_equal 'This is the home page', response.body
       end
 
@@ -68,11 +74,15 @@ class Cms::PagesTest < ActionController::IntegrationTest
         assert_nil @company.pages.root
         assert @company.pages.published.empty?
 
-        get '/'
-        assert_response 404
+        assert_raises(ActionController::RoutingError) do
+          get '/'
+          assert_response 404
+        end
 
-        get ''
-        assert_response 404
+        assert_raises(ActionController::RoutingError) do
+          get ''
+          assert_response 404
+        end
       end
 
       should "load a cms page" do
@@ -88,7 +98,7 @@ class Cms::PagesTest < ActionController::IntegrationTest
         assert_equal 'This is the home page', response.body
 
         # if we create a new page with the previous slug, it gets called instead
-        @company.pages.create :name => 'another_hom', :slug => '/home_page/123', :content => 'Different Home', :published => true
+        @company.pages.create :name => 'another_home', :slug => '/home_page/123', :content => 'Different Home', :published => true
         get 'home_page/123'
         assert_response :success
         assert_equal 'Different Home', response.body
@@ -122,82 +132,6 @@ class Cms::PagesTest < ActionController::IntegrationTest
           assert_select '#content span', "test"
         end
       end
-
-      context "asset_data" do
-        should "find assets" do
-          @asset = Factory(:image_asset, :context => @company, :custom_height => 200, :custom_width => 200)
-
-          @page = @company.pages.create :name => 'content', :published => true, :content => <<-LIQUID
-          {% asset_data %}
-          LIQUID
-
-          get @page.url
-          assert response.body.include?("The required 'tag' parameter is missing.")
-
-          @page.content = <<-LIQUID
-          {% asset_data tag:'test' %}
-          <span id="count">{{ assets | size }}</span>
-          LIQUID
-          @page.save
-
-          get @page.url
-          assert_select '#count', '0'
-
-          # update the tags
-          @asset.tag_list = "test"
-          @asset.save
-
-          @page.content = <<-LIQUID
-          {% asset_data tag:'test' random:true %}
-          <span id="count">{{ assets | size }}</span>
-          {{ assets | first | assign_to: 'meta_asset' }}
-          <span class="o_dims">{{ meta_asset.image.original.width }}</span>
-          <span class="c_dims">{{ meta_asset.image.custom.width }}</span>
-          <span class="name">{{ meta_asset.meta.name_test }}</span>
-          <span class="location">{{ meta_asset.meta.location }}</span>
-          <span class="none">{{ meta_asset.meta.none }}</span>
-          LIQUID
-          @page.save
-
-          get @page.url
-          assert_select '#count', '1'
-          assert_select '.o_dims', '20'
-          assert_select '.c_dims', '20'
-          assert_select '.name', ''
-          assert_select '.location', ''
-          assert_select '.none', ''
-
-          # update the meta data
-          @asset.meta_data = [{:name => 'name_test', :value => 'value test'}, {:name => 'location', :value => 'earth'}]
-          @asset.save
-
-          @page.content = <<-LIQUID
-          {% asset_data tag:'test' as:'meta_assets' %}
-          <span id="count">{{ meta_assets | size }}</span>
-          {{ meta_assets | first | assign_to: 'meta_asset' }}
-          <span class="name">{{ meta_asset.meta.name_test }}</span>
-          <span class="location">{{ meta_asset.meta.location }}</span>
-          <span class="none">{{ meta_asset.meta.none }}</span>
-          LIQUID
-          @page.save
-
-          get @page.url
-          assert_select '#count', '1'
-          assert_select '.name', 'value test'
-          assert_select '.location', 'earth'
-          assert_select '.none', ''
-
-          # specify the limit as 0
-          @page.content = <<-LIQUID
-          {% asset_data tag:'test' as:'meta_assets' random:true limit:0 %}
-          <span id="count">{{ meta_assets | size }}</span>
-          LIQUID
-          @page.save
-
-          get @page.url
-          assert_select '#count', '0'
-        end
-      end
     end
     
     context "filters" do
@@ -342,65 +276,24 @@ class Cms::PagesTest < ActionController::IntegrationTest
     end
 
     should "throw an exception if a page isn't found" do
-      get '/home_page_not_found' 
-      assert_response 404
+      assert_raises(ActionController::RoutingError) do
+        get '/home_page_not_found' 
+        assert_response 404
+      end
     end
 
     should "not load reserved paths for namespaced routes" do
-      get '/support'
-      assert_response 404
+      assert_raises(ActionController::RoutingError) do
+        get '/support'
+        assert_response 404
+      end
     end
 
     should "not load an unknown path for reserved namespaces" do
-      get '/cms/pages/unknown'
-      assert_response 404
-    end
-  end
-
-  context "caching" do
-    setup do
-      ActionController::Base.perform_caching = true
-      Rails.cache.clear
-      @page = Factory(:page, :context => @company)
-    end
-
-    teardown do
-      ActionController::Base.perform_caching = false
-    end
-
-=begin
-    should "expire the cache when the page is updated" do
-      assert_cache_empty
-
-      get @page.url
-      assert_cache_present
-
-      # updating the page will remove the cache
-      put cms_page_path(@page), :content => 'new content'
-      assert_cache_empty
-
-      get @page.url
-      assert_cache_present
-
-      # destroying the page will remove the cache
-      delete cms_page_path(@page)
-      assert_cache_empty
-    end
-
-    should "generate a cache key" do
-      get '/'
-      assert_cache_key "views/CONTEXT_PATH_#{@company.id}"
-
-      get @page.url
-      assert_cache_key "views/CONTEXT_PATH_#{@company.id}/page"
-
-      get @page.url+'?page=1&test=abcde'
-      assert_cache_key "views/CONTEXT_PATH_#{@company.id}/page/page=1&test=abcde"
-
-      # different order sent via url, but the path params will be sorted in the path
-      get @page.url+'?test=abcde&page=1'
-      assert_cache_key "views/CONTEXT_PATH_#{@company.id}/page/page=1&test=abcde"
+      assert_raises(ActionController::RoutingError) do
+        get '/cms/pages/unknown'
+        assert_response 404
+      end
     end
-=end
   end
 end

data/test/rails_app/Gemfile

@@ -0,0 +1,34 @@
+source 'http://rubygems.org'
+
+gem 'rails', '3.0.1'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+gem 'sqlite3-ruby', :require => 'sqlite3'
+
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'ruby-debug'
+
+# Bundle the extra gems:
+# gem 'bj'
+# gem 'nokogiri'
+# gem 'sqlite3-ruby', :require => 'sqlite3'
+# gem 'aws-s3', :require => 'aws/s3'
+
+# Bundle gems for the local environment. Make sure to
+# put test-only gems in this group so their generators
+# and rake tasks are available in development mode:
+# group :development, :test do
+#   gem 'webrat'
+# end
+
+gem 'liquid_cms', :path => '../..'
+gem 'vestal_versions', '~> 1.2.1', :git => 'http://github.com/adamcooper/vestal_versions.git'
+gem 'mongrel'