alchemy_cms 2.5.3.1 → 2.6.0.rc5

data/spec/{integration → features}/admin/picture_library_integration_spec.rb

@@ -14,14 +14,14 @@ describe "Picture Library", :js => true do
     end
 
     it "it should be possible to filter tags by clicking on its name in the tag list" do
-      visit '/alchemy/admin/pictures'
+      visit '/admin/pictures'
       click_on 'tag1 (1)'
       page.should have_content 'TaggedWith1'
       page.should_not have_content 'TaggedWith2'
     end
 
     it "it should be possible to undo tag filtering by clicking on an active tag name" do
-      visit '/alchemy/admin/pictures'
+      visit '/admin/pictures'
       click_on 'tag1 (1)'
       page.should_not have_content 'TaggedWith2'
       click_on 'tag1 (1)'
@@ -29,7 +29,7 @@ describe "Picture Library", :js => true do
     end
 
     it "it should be possible to tighten the tag scope by clicking on another tag name" do
-      visit '/alchemy/admin/pictures'
+      visit '/admin/pictures'
       click_on 'tag1 (1)'
       click_on 'tag2 (1)'
       page.should have_content "You don't have any images in your archive"
@@ -44,12 +44,12 @@ describe "Picture Library", :js => true do
     end
 
     it "should list all applied tags" do
-      visit '/alchemy/admin/pictures'
+      visit '/admin/pictures'
       page.should have_content 'bla'
     end
 
     it "should be possible to filter pictures by tag" do
-      visit '/alchemy/admin/pictures'
+      visit '/admin/pictures'
       click_on 'bla (1)'
       page.should have_content 'bla'
     end

data/spec/{integration → features}/admin/resources_integration_spec.rb

@@ -56,7 +56,7 @@ describe "Resources" do
 
       it "lists the new item" do
         page.should have_content "My second event"
-        page.should have_content "2012-03-03"
+        page.should have_content "03 Mar 2012"
       end
 
       it "shows a success message" do

data/spec/{integration → features}/pages_controller_spec.rb

@@ -19,7 +19,7 @@ module Alchemy
         p = FactoryGirl.create(:public_page, :do_not_autogenerate => false)
         article = p.elements.find_by_name('article')
         article.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop', :public => true)
-        visit "/alchemy/#{p.urlname}"
+        visit "/#{p.urlname}"
         within('div#content div.article div.intro') { page.should have_content('Welcome to Peters Petshop') }
       end
 
@@ -28,8 +28,8 @@ module Alchemy
           FactoryGirl.create(:public_page, :visible => true, :name => 'Page 1'),
           FactoryGirl.create(:public_page, :visible => true, :name => 'Page 2')
         ]
-        visit '/alchemy/'
-        within('div#navigation ul') { page.should have_selector('li a[href="/alchemy/page-1"], li a[href="/alchemy/page-2"]') }
+        visit '/'
+        within('div#navigation ul') { page.should have_selector('li a[href="/page-1"], li a[href="/page-2"]') }
       end
 
     end
@@ -39,42 +39,42 @@ module Alchemy
       before { search_page }
 
       it "should have a correct path in the form tag" do
-        visit('/alchemy/suche')
-        page.should have_selector('div#content form[action="/alchemy/suche"]')
+        visit('/suche')
+        page.should have_selector('div#content form[action="/suche"]')
       end
 
       context "performing the search" do
 
         it "should display search results for richtext essences" do
           element.content_by_name('text').essence.update_attributes(:body => '<p>Welcome to Peters Petshop</p>')
-          visit('/alchemy/suche?query=Petshop')
+          visit('/suche?query=Petshop')
           within('div#content .search_result') { page.should have_content('Petshop') }
         end
 
         it "should display search results for text essences" do
           element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop')
-          visit('/alchemy/suche?query=Petshop')
+          visit('/suche?query=Petshop')
           within('div#content .search_result') { page.should have_content('Petshop') }
         end
 
         it "should not find contents placed on global-pages (layoutpage => true)" do
           public_page_1.update_attributes(:layoutpage => true)
           element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop')
-          visit('/alchemy/suche?query=Petshop')
+          visit('/suche?query=Petshop')
           within('div#content') { page.should have_css('h2.no_search_results') }
         end
 
         it "should not find contents placed on unpublished pages (public => false)" do
           public_page_1.update_attributes(:public => false)
           element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop')
-          visit('/alchemy/suche?query=Petshop')
+          visit('/suche?query=Petshop')
           within('div#content') { page.should have_css('h2.no_search_results') }
         end
 
         it "should not find contents placed on restricted pages (restricted => true)" do
           public_page_1.update_attributes(:restricted => true)
           element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop')
-          visit('/alchemy/suche?query=Petshop')
+          visit('/suche?query=Petshop')
           within('div#content') { page.should have_css('h2.no_search_results') }
         end
 
@@ -93,7 +93,7 @@ module Alchemy
 
           it "should not display search results from other languages then current" do
             english_element.content_by_name('headline').essence.update_attributes(:body => 'Joes Hardware')
-            visit('/alchemy/de/suche?query=Hardware')
+            visit('/de/suche?query=Hardware')
             within('div#content') { page.should have_css('h2.no_search_results') }
             page.should_not have_css('div#content .search_result')
           end
@@ -115,28 +115,28 @@ module Alchemy
 
         context "if no language params are given" do
           it "should redirect to url with nested language code" do
-            visit "/alchemy/#{public_page_1.urlname}"
-            page.current_path.should == "/alchemy/#{public_page_1.language_code}/#{public_page_1.urlname}"
+            visit "/#{public_page_1.urlname}"
+            page.current_path.should == "/#{public_page_1.language_code}/#{public_page_1.urlname}"
           end
         end
 
         context "if requested page is unpublished" do
 
           before do
+            Config.stub!(:get) { |arg| arg == :url_nesting ? false : Config.parameter(arg) }
             public_page_1.update_attributes(:public => false, :name => 'Not Public', :urlname => '')
             public_child
-            Config.stub!(:get) { |arg| arg == :url_nesting ? false : Config.parameter(arg) }
           end
 
           it "should redirect to public child" do
-            visit "/alchemy/#{default_language.code}/not-public"
-            page.current_path.should == "/alchemy/#{default_language.code}/public-child"
+            visit "/#{default_language.code}/not-public"
+            page.current_path.should == "/#{default_language.code}/public-child"
           end
 
           context "and url has no language code" do
             it "should redirect to url of public child with language code of default language" do
-              visit '/alchemy/not-public'
-              page.current_path.should == "/alchemy/#{default_language.code}/public-child"
+              visit '/not-public'
+              page.current_path.should == "/#{default_language.code}/public-child"
             end
           end
 
@@ -144,27 +144,27 @@ module Alchemy
 
         context "if requested url is index url" do
           it "should redirect to pages url with default language" do
-            visit '/alchemy/'
-            page.current_path.should == "/alchemy/#{default_language.code}/home"
+            visit '/'
+            page.current_path.should == "/#{default_language.code}/home"
           end
         end
 
         context "if requested url is only the language code" do
           it "should redirect to pages url with default language" do
-            visit "/alchemy/#{default_language.code}"
-            page.current_path.should == "/alchemy/#{default_language.code}/home"
+            visit "/#{default_language.code}"
+            page.current_path.should == "/#{default_language.code}/home"
           end
         end
 
         context "requested url is only the urlname" do
           it "then it should redirect to pages url with nested language." do
-            visit '/alchemy/home'
-            page.current_path.should == '/alchemy/de/home'
+            visit '/home'
+            page.current_path.should == '/de/home'
           end
         end
 
         it "should keep additional params" do
-          visit "/alchemy/#{public_page_1.urlname}?query=Peter"
+          visit "/#{public_page_1.urlname}?query=Peter"
           page.current_url.should match(/\?query=Peter/)
         end
 
@@ -174,67 +174,19 @@ module Alchemy
 
           it "should render 404 if urlname and lang parameter do not belong to same page" do
             FactoryGirl.create(:english)
-            visit "/alchemy/en/#{public_page_1.urlname}"
+            visit "/en/#{public_page_1.urlname}"
             page.status_code.should == 404
           end
 
           it "should render 404 if requested language does not exist" do
-            visit "/alchemy/fo/#{public_page_1.urlname}"
+            public_page_1
+            LegacyPageUrl.delete_all
+            visit "/fo/#{public_page_1.urlname}"
             page.status_code.should == 404
           end
 
         end
 
-        context "with url nesting" do
-
-          before do
-            level1 = FactoryGirl.create(:public_page, :name => 'catalog')
-            level2 = FactoryGirl.create(:public_page, :parent_id => level1.id, :name => 'products')
-            level3 = FactoryGirl.create(:public_page, :parent_id => level2.id, :name => 'screwdriver')
-          end
-
-          context "enabled" do
-
-            before(:each) do
-              Config.stub!(:get) { |arg| arg == :url_nesting ? true : Config.parameter(arg) }
-            end
-
-            context "requesting a non nested url" do
-
-              it "should redirect to nested url" do
-                visit "/alchemy/de/screwdriver"
-                page.current_path.should == '/alchemy/de/catalog/products/screwdriver'
-              end
-
-              it "should only redirect to nested url if page is nested" do
-                visit "/alchemy/de/catalog"
-                page.status_code.should == 200
-                page.current_path.should == "/alchemy/de/catalog"
-              end
-
-            end
-
-          end
-
-          context "disabled" do
-
-            before(:each) do
-              Config.stub!(:get) { |arg| arg == :url_nesting ? false : Config.parameter(arg) }
-            end
-
-            context "requesting a nested url" do
-
-              it "should redirect to not nested url" do
-                visit "/alchemy/de/catalog/products/screwdriver"
-                page.current_path.should == "/alchemy/de/screwdriver"
-              end
-
-            end
-
-          end
-
-        end
-
       end
 
       context "not in multi language mode" do
@@ -245,22 +197,8 @@ module Alchemy
         end
 
         it "should redirect from nested language code url to normal url" do
-          visit "/alchemy/de/#{public_page_1.urlname}"
-          page.current_path.should == "/alchemy/#{public_page_1.urlname}"
-        end
-
-        context "with no lang parameter" do
-
-          it "should have defaults language language_id in the session" do
-            get show_page_path(:urlname => 'a-public-page')
-            controller.session[:language_id].should == Language.get_default.id
-          end
-
-          it "should have defaults language language_code in the session" do
-            get show_page_path(:urlname => 'a-public-page')
-            controller.session[:language_code].should == Language.get_default.code
-          end
-
+          visit "/de/#{public_page_1.urlname}"
+          page.current_path.should == "/#{public_page_1.urlname}"
         end
 
         context "should redirect to public child" do
@@ -271,24 +209,24 @@ module Alchemy
           end
 
           it "if requested page is unpublished" do
-            visit '/alchemy/not-public'
-            page.current_path.should == '/alchemy/public-child'
+            visit '/not-public'
+            page.current_path.should == '/public-child'
           end
 
           it "with normal url, if requested url has nested language code and is not public" do
-            visit '/alchemy/de/not-public'
-            page.current_path.should == '/alchemy/public-child'
+            visit '/de/not-public'
+            page.current_path.should == '/public-child'
           end
 
         end
 
         it "should redirect to pages url, if requested url is index url" do
-          visit '/alchemy/'
-          page.current_path.should == '/alchemy/home'
+          visit '/'
+          page.current_path.should == '/home'
         end
 
         it "should keep additional params" do
-          visit "/alchemy/de/#{public_page_1.urlname}?query=Peter"
+          visit "/de/#{public_page_1.urlname}?query=Peter"
           page.current_url.should match(/\?query=Peter/)
         end
 
@@ -300,26 +238,18 @@ module Alchemy
 
       before do
         User.stub!(:admins).and_return([1, 2]) # We need a admin user or the signup page will show up
-        visit "/alchemy/non-existing-page"
-      end
-
-      context "if a language root page exists" do
-
-        it "should render the status code in the title tag" do
-          within("title") { page.should have_content("404") }
-        end
-
+        visit "/non-existing-page"
       end
 
-      it "should render public/404.html when it exists" do
-        within("title") { page.should have_content("404") }
+      it "should render public/404.html" do
+        page.status_code.should == 404
       end
 
     end
 
     context "with invalid byte code char in urlname parameter" do
       it "should render page not found" do
-        visit '/alchemy/%ed'
+        visit '/%ed'
         page.status_code.should == 404
       end
     end

data/spec/{integration → features}/picture_security_spec.rb

@@ -10,7 +10,7 @@ describe 'Picture renderung security', :js => true do
   context "passing no security token" do
 
     it 'should return a bad request (400)' do
-      visit "/alchemy/pictures/#{picture.id}/show/image.png"
+      visit "/pictures/#{picture.id}/show/image.png"
       page.status_code.should == 400
     end
 
@@ -19,7 +19,7 @@ describe 'Picture renderung security', :js => true do
   context "passing correct security token" do
 
     before do
-      visit "/alchemy/pictures/#{picture.id}/show/image.png?sh=#{picture.security_token}"
+      visit "/pictures/#{picture.id}/show/image.png?sh=#{picture.security_token}"
     end
 
     it 'should return image' do

data/spec/{integration → features}/security_spec.rb

@@ -10,8 +10,8 @@ describe "Security: " do
   context "If no user is present" do
 
     it "render the signup view" do
-      visit '/alchemy'
-      current_path.should == '/alchemy/admin/signup'
+      visit '/'
+      current_path.should == '/admin/signup'
     end
   end
 
@@ -22,14 +22,14 @@ describe "Security: " do
     end
 
     it "a visitor should not be able to signup" do
-      visit '/alchemy/admin/signup'
+      visit '/admin/signup'
       within('#alchemy_greeting') { page.should_not have_content('have to signup') }
     end
 
     context "that is not logged in" do
       it "should see login-form" do
-        visit '/alchemy/admin/dashboard'
-        current_path.should == '/alchemy/admin/login'
+        visit '/admin/dashboard'
+        current_path.should == '/admin/login'
       end
     end
 
@@ -40,8 +40,8 @@ describe "Security: " do
       end
 
       it "should be redirected to dashboard" do
-        visit '/alchemy/admin/login'
-        current_path.should == '/alchemy/admin/dashboard'
+        visit '/admin/login'
+        current_path.should == '/admin/dashboard'
       end
 
     end

data/spec/helpers/admin/base_helper_spec.rb

@@ -96,56 +96,6 @@ module Alchemy
 
     end
 
-    context "Filtering pictures depending on tags from params" do
-
-      let(:tag) do
-        mock_model(ActsAsTaggableOn::Tag, :name => "foo")
-      end
-
-      describe "#pictures_filtered_by_tag?" do
-        it "should return true if the filterlist contains the given tag" do
-          controller.params[:tagged_with] = "foo,bar,baz"
-          helper.pictures_filtered_by_tag?(tag).should == true
-        end
-
-        it "should return false if the filterlist does not contain the given tag" do
-          controller.params[:tagged_with] = "bar,baz"
-          helper.pictures_filtered_by_tag?(tag).should == false
-        end
-      end
-
-      describe "#add_to_picture_tag_filter" do
-        context "if params[:tagged_with] is not present" do
-          it "should return an Array with the given tag name" do
-            helper.add_to_picture_tag_filter(tag).should == ["foo"]
-          end
-        end
-
-        context "if params[:tagged_with] contains some tag names" do
-          it "should return an Array of tag names including the given one" do
-            controller.params[:tagged_with] = "bar,baz"
-            helper.add_to_picture_tag_filter(tag).should == ["bar", "baz", "foo"]
-          end
-        end
-      end
-
-      describe "#remove_from_picture_tag_filter" do
-        context "if params[:tagged_with] is not present" do
-          it "should return an empty Array" do
-            helper.remove_from_picture_tag_filter(tag).should be_empty
-          end
-        end
-
-        context "if params[:tagged_with] contains some tag names" do
-          it "should return an Array of tag names without the given one" do
-            controller.params[:tagged_with] = "bar,baz,foo"
-            helper.remove_from_picture_tag_filter(tag).should == ["bar", "baz"]
-          end
-        end
-      end
-
-    end
-
     describe '#pages_for_select' do
 
       let(:contact_form) { FactoryGirl.create(:element, :name => 'contactform', :create_contents_after_create => true) }