alchemy_cms 2.4.1 → 2.5.0.b2

data/spec/integration/translation_integration_spec.rb

@@ -4,34 +4,33 @@ describe "Translation integration" do
 
   context "in admin backend" do
 
-    it "should be possible to set the locale of the admin backend via params" do
+    before do
       authorize_as_admin
+    end
+
+    it "should be possible to set the locale of the admin backend via params" do
       visit admin_dashboard_path(:locale => :de)
       page.should have_content('Willkommen')
     end
 
     it "should store the current locale in the session" do
-      authorize_as_admin
       visit admin_dashboard_path(:locale => :de)
       visit admin_dashboard_path
       page.should have_content('Willkommen')
     end
 
     it "should be possible to change the current locale in the session" do
-      authorize_as_admin
       visit admin_dashboard_path(:locale => :de)
       visit admin_dashboard_path(:locale => :en)
       page.should have_content('Welcome')
     end
 
     it "should not be possible to switch the locale of the admin backend to an unknown locale" do
-      authorize_as_admin
       visit admin_dashboard_path(:locale => :ko)
       page.should have_content('Welcome')
     end
 
     it "should use the current users language setting if no other parameter is given" do
-      authorize_as_admin(locale = nil)
       Alchemy::User.first.update_attributes(:language => :de)
       visit admin_dashboard_path
       page.should have_content('Willkommen')
@@ -39,17 +38,4 @@ describe "Translation integration" do
 
   end
 
-  context "with translated header" do
-
-    before do
-      Capybara.current_driver = :rack_test_translated_header
-    end
-
-    it "should use the browsers language setting if no other parameter is given" do
-      visit root_path
-      ::I18n.locale.should == :de
-    end
-
-  end
-
 end

data/spec/models/element_spec.rb

@@ -102,16 +102,16 @@ module Alchemy
 
     context "no description files are found" do
 
-      before(:each) do
-        FileUtils.mv(File.join(File.dirname(__FILE__), '..', '..', 'config', 'alchemy', 'elements.yml'), File.join(File.dirname(__FILE__), '..', '..', 'config', 'alchemy', 'elements.yml.bak'))
+      before do
+        FileUtils.mv(File.join(File.dirname(__FILE__), '../dummy/config/alchemy/elements.yml'), File.join(File.dirname(__FILE__), '../dummy/config/alchemy/elements.yml.bak'))
       end
 
       it "should raise an error" do
         expect { Element.descriptions }.to raise_error(LoadError)
       end
 
-      after(:each) do
-        FileUtils.mv(File.join(File.dirname(__FILE__), '..', '..', 'config', 'alchemy', 'elements.yml.bak'), File.join(File.dirname(__FILE__), '..', '..', 'config', 'alchemy', 'elements.yml'))
+      after do
+        FileUtils.mv(File.join(File.dirname(__FILE__), '../dummy/config/alchemy/elements.yml.bak'), File.join(File.dirname(__FILE__), '../dummy/config/alchemy/elements.yml'))
       end
 
     end

data/spec/models/picture_spec.rb

@@ -12,23 +12,25 @@ module Alchemy
       picture.should be_valid
     end
 
+    it "is not valid without image file" do
+      picture = Picture.new
+      picture.should_not be_valid
+    end
+
     describe '#suffix' do
 
       it "should return the suffix of original filename" do
-        pic = stub_model(Picture, :image_filename => 'kitten.JPG')
+        pic = stub_model(Picture, :image_file_name => 'kitten.JPG')
+        pic.stub(:image_file).and_return(OpenStruct.new({:ext => 'jpg'}))
         pic.suffix.should == "jpg"
       end
 
       context "image has no suffix" do
-
-        before(:each) do
-          @pic = stub_model(Picture, :image_filename => 'kitten')
-        end
-
         it "should return empty string" do
-          @pic.suffix.should == ""
+          pic = stub_model(Picture, :image_file_name => 'kitten')
+          pic.stub(:image_file).and_return(OpenStruct.new({:ext => ''}))
+          pic.suffix.should == ""
         end
-
       end
 
     end
@@ -36,27 +38,24 @@ module Alchemy
     describe '#humanized_name' do
 
       it "should return a humanized version of original filename" do
-        pic = stub_model(Picture, :image_filename => 'cute_kitten.JPG')
+        pic = stub_model(Picture, :image_file_name => 'cute_kitten.JPG')
+        pic.stub(:image_file).and_return(OpenStruct.new({:ext => 'jpg'}))
         pic.humanized_name.should == "Cute kitten"
       end
 
       it "should not remove incidents of suffix from filename" do
-        pic = stub_model(Picture, :image_filename => 'cute_kitten_mo.jpgi.JPG')
+        pic = stub_model(Picture, :image_file_name => 'cute_kitten_mo.jpgi.JPG')
+        pic.stub(:image_file).and_return(OpenStruct.new({:ext => 'jpg'}))
         pic.humanized_name.should == "Cute kitten mo.jpgi"
         pic.humanized_name.should_not == "Cute kitten moi"
       end
 
       context "image has no suffix" do
-
-        before(:each) do
-          @pic = stub_model(Picture, :image_filename => 'cute_kitten')
-          @pic.stub!(:suffix).and_return("")
-        end
-
         it "should return humanized name" do
-          @pic.humanized_name.should == "Cute kitten"
+          pic = stub_model(Picture, :image_file_name => 'cute_kitten')
+          pic.stub(:suffix).and_return("")
+          pic.humanized_name.should == "Cute kitten"
         end
-
       end
 
     end
@@ -76,11 +75,15 @@ module Alchemy
       end
 
       it "should convert crop true value into string" do
-        p = [@pic.id, nil, 'crop', nil, nil, Rails.configuration.secret_token].join('-')
-        digest = Digest::SHA1.hexdigest(p)[0..15]
+        digest = PictureAttributes.secure({:id => @pic.id, :crop => 'crop'})
         @pic.security_token(:crop => true).should == digest
       end
 
+      it "should always include picture id" do
+        digest = PictureAttributes.secure({:id => @pic.id})
+        @pic.security_token.should == digest
+      end
+
     end
 
     describe '.last_upload' do
@@ -119,5 +122,19 @@ module Alchemy
 
     end
 
+    describe '#destroy' do
+      context "a picture that is assigned in an essence" do
+
+        let(:essence_picture) { EssencePicture.create }
+        let(:picture) { FactoryGirl.create :picture }
+        before { essence_picture.update_attributes(:picture_id => picture.id) }
+
+        it "should raise error message" do
+          expect { picture.destroy }.to raise_error PictureInUseError
+        end
+
+      end
+    end
+
   end
 end

data/spec/models/site_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+module Alchemy
+  describe Site do
+    let(:site) { FactoryGirl.create(:site) }
+    let(:another_site) { FactoryGirl.create(:site, name: 'Another Site', host: 'another.com') }
+
+    describe 'new instances' do
+      subject { FactoryGirl.build(:site) }
+
+      it 'should start out with on languages' do
+        subject.languages.should be_empty
+      end
+
+      context 'when being saved' do
+        context 'when it has no languages yet' do
+          it 'should automatically create a default language' do
+            subject.save!
+            subject.languages.count.should == 1
+            subject.languages.first.should be_default
+          end
+        end
+
+        context 'when it already has a language' do
+          let(:language) { FactoryGirl.build(:language, site: nil) }
+          before { subject.languages << language }
+
+          it 'should not create any additional languages' do
+            subject.languages.should == [language]
+
+            expect { subject.save! }.
+              to_not change(subject, "languages")
+          end
+        end
+      end
+    end
+
+    describe '.current' do
+      context 'when set to a site' do
+        before { Site.current = site }
+        specify "Language should be scoped to that site"
+      end
+
+      context 'when set to nil' do
+        before { Site.current = nil }
+        specify "Language should not be scoped to a site"
+      end
+    end
+
+    describe '#current?' do
+      subject { site.current? }
+
+      context 'when Site.current is set to the same site' do
+        before { Site.current = site }
+        it { should be_true }
+      end
+
+      context 'when Site.current is set to nil' do
+        before { Site.current = nil }
+        it { should be_false }
+      end
+
+      context 'when Site.current is set to a different site' do
+        before { Site.current = another_site }
+        it { should be_false }
+      end
+    end
+  end
+end

data/spec/routing_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "The Routing", :type => :routing do
 
-  before { @routes = Alchemy::Engine.routes }
+  before(:each) { @routes = Alchemy::Engine.routes }
 
   context "for downloads" do
 
@@ -10,44 +10,44 @@ describe "The Routing", :type => :routing do
       {
         :get => "/attachment/32/download/Presseveranstaltung.pdf"
       }.should route_to(
-        :controller => "alchemy/attachments",
-        :action => "download",
-        :id => "32",
-        :name => "Presseveranstaltung",
-        :format => "pdf"
-      )
+                 :controller => "alchemy/attachments",
+                 :action => "download",
+                 :id => "32",
+                 :name => "Presseveranstaltung",
+                 :format => "pdf"
+               )
     end
 
     it "should have a route for legacy Alchemy 1.x downloads" do
       {
         :get => "/attachment/32/download?name=Presseveranstaltung.pdf"
       }.should route_to(
-        :controller => "alchemy/attachments",
-        :action => "download",
-        :id => "32"
-      )
+                 :controller => "alchemy/attachments",
+                 :action => "download",
+                 :id => "32"
+               )
     end
 
     it "should have a route for legacy washAPP downloads" do
       {
         :get => "/wa_files/download/11"
       }.should route_to(
-        :controller => "alchemy/attachments",
-        :action => "download",
-        :id => "11"
-      )
+                 :controller => "alchemy/attachments",
+                 :action => "download",
+                 :id => "11"
+               )
     end
 
     it "should have a route for legacy WebMate downloads" do
       {
         :get => "/uploads/files/0000/0028/Pressetext.pdf"
       }.should route_to(
-        :controller => "alchemy/attachments",
-        :action => "download",
-        :id => "0028",
-        :name => "Pressetext",
-        :suffix => "pdf"
-      )
+                 :controller => "alchemy/attachments",
+                 :action => "download",
+                 :id => "0028",
+                 :name => "Pressetext",
+                 :suffix => "pdf"
+               )
     end
 
   end
@@ -60,11 +60,11 @@ describe "The Routing", :type => :routing do
         {
           :get => "/products/my-product"
         }.should route_to(
-          :controller => "alchemy/pages",
-          :action => "show",
-          :level1 => "products",
-          :urlname => "my-product"
-        )
+                   :controller => "alchemy/pages",
+                   :action => "show",
+                   :level1 => "products",
+                   :urlname => "my-product"
+                 )
       end
 
       context "and language" do
@@ -73,12 +73,12 @@ describe "The Routing", :type => :routing do
           {
             :get => "/de/products/my-product"
           }.should route_to(
-            :controller => "alchemy/pages",
-            :action => "show",
-            :level1 => "products",
-            :urlname => "my-product",
-            :lang => "de"
-          )
+                     :controller => "alchemy/pages",
+                     :action => "show",
+                     :level1 => "products",
+                     :urlname => "my-product",
+                     :lang => "de"
+                   )
         end
 
       end
@@ -91,12 +91,12 @@ describe "The Routing", :type => :routing do
         {
           :get => "/catalog/products/my-product"
         }.should route_to(
-          :controller => "alchemy/pages",
-          :action => "show",
-          :level1 => "catalog",
-          :level2 => "products",
-          :urlname => "my-product"
-        )
+                   :controller => "alchemy/pages",
+                   :action => "show",
+                   :level1 => "catalog",
+                   :level2 => "products",
+                   :urlname => "my-product"
+                 )
       end
 
       context "and language" do
@@ -105,13 +105,13 @@ describe "The Routing", :type => :routing do
           {
             :get => "/de/catalog/products/my-product"
           }.should route_to(
-            :controller => "alchemy/pages",
-            :action => "show",
-            :level1 => "catalog",
-            :level2 => "products",
-            :urlname => "my-product",
-            :lang => "de"
-          )
+                     :controller => "alchemy/pages",
+                     :action => "show",
+                     :level1 => "catalog",
+                     :level2 => "products",
+                     :urlname => "my-product",
+                     :lang => "de"
+                   )
         end
 
       end
@@ -124,13 +124,13 @@ describe "The Routing", :type => :routing do
         {
           :get => "/2011/12/08/my-post"
         }.should route_to(
-          :controller => "alchemy/pages",
-          :action => "show",
-          :level1 => "2011",
-          :level2 => "12",
-          :level3 => "08",
-          :urlname => "my-post"
-        )
+                   :controller => "alchemy/pages",
+                   :action => "show",
+                   :level1 => "2011",
+                   :level2 => "12",
+                   :level3 => "08",
+                   :urlname => "my-post"
+                 )
       end
 
       context "and language" do
@@ -139,14 +139,14 @@ describe "The Routing", :type => :routing do
           {
             :get => "/de/2011/12/08/my-post"
           }.should route_to(
-            :controller => "alchemy/pages",
-            :action => "show",
-            :level1 => "2011",
-            :level2 => "12",
-            :level3 => "08",
-            :urlname => "my-post",
-            :lang => "de"
-          )
+                     :controller => "alchemy/pages",
+                     :action => "show",
+                     :level1 => "2011",
+                     :level2 => "12",
+                     :level3 => "08",
+                     :urlname => "my-post",
+                     :lang => "de"
+                   )
         end
 
       end
@@ -161,97 +161,97 @@ describe "The Routing", :type => :routing do
       {
         :get => "/pictures/3/show/900x300/kitten.jpg"
       }.should route_to(
-        :controller => "alchemy/pictures",
-        :action => "show",
-        :id => "3",
-        :size => "900x300",
-        :name => "kitten",
-        :format => "jpg"
-      )
+                 :controller => "alchemy/pictures",
+                 :action => "show",
+                 :id => "3",
+                 :size => "900x300",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
     end
 
     it "should route to cropped show action" do
       {
         :get => "/pictures/3/show/900x300/crop/kitten.jpg"
       }.should route_to(
-        :controller => "alchemy/pictures",
-        :action => "show",
-        :id => "3",
-        :size => "900x300",
-        :crop => "crop",
-        :name => "kitten",
-        :format => "jpg"
-      )
+                 :controller => "alchemy/pictures",
+                 :action => "show",
+                 :id => "3",
+                 :size => "900x300",
+                 :crop => "crop",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
     end
 
     it "should route to cropped mask show action" do
       get(
         "/pictures/3/show/300x300/crop/200x50/100x100/kitten.jpg"
       ).should route_to(
-        :controller => "alchemy/pictures",
-        :action => "show",
-        :id => "3",
-        :size => "300x300",
-        :crop => "crop",
-        :crop_from => "200x50",
-        :crop_size => "100x100",
-        :name => "kitten",
-        :format => "jpg"
-      )
+                 :controller => "alchemy/pictures",
+                 :action => "show",
+                 :id => "3",
+                 :size => "300x300",
+                 :crop => "crop",
+                 :crop_from => "200x50",
+                 :crop_size => "100x100",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
     end
 
     it "should route to thumbnail action" do
       get(
         "/pictures/3/thumbnails/small/kitten.jpg"
       ).should route_to(
-        :controller => "alchemy/pictures",
-        :action => "thumbnail",
-        :id => "3",
-        :size => "small",
-        :name => "kitten",
-        :format => "jpg"
-      )
+                 :controller => "alchemy/pictures",
+                 :action => "thumbnail",
+                 :id => "3",
+                 :size => "small",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
     end
 
     it "should route to cropped thumbnail action" do
       get(
         "/pictures/3/thumbnails/small/crop/kitten.jpg"
       ).should route_to(
-        :controller => "alchemy/pictures",
-        :action => "thumbnail",
-        :id => "3",
-        :crop => "crop",
-        :size => "small",
-        :name => "kitten",
-        :format => "jpg"
-      )
+                 :controller => "alchemy/pictures",
+                 :action => "thumbnail",
+                 :id => "3",
+                 :crop => "crop",
+                 :size => "small",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
     end
 
     it "should route to cropped and masked thumbnail" do
       get(
         "/pictures/3/thumbnails/small/0x0/200x200/kitten.jpg"
       ).should route_to(
-        :controller => "alchemy/pictures",
-        :action => "thumbnail",
-        :id => "3",
-        :crop_from => "0x0",
-        :crop_size => "200x200",
-        :size => "small",
-        :name => "kitten",
-        :format => "jpg"
-      )
+                 :controller => "alchemy/pictures",
+                 :action => "thumbnail",
+                 :id => "3",
+                 :crop_from => "0x0",
+                 :crop_size => "200x200",
+                 :size => "small",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
     end
 
     it "should route to zoomed picture" do
       get(
         "/pictures/3/zoom/kitten.jpg"
       ).should route_to(
-        :controller => "alchemy/pictures",
-        :action => "zoom",
-        :id => "3",
-        :name => "kitten",
-        :format => "jpg"
-      )
+                 :controller => "alchemy/pictures",
+                 :action => "zoom",
+                 :id => "3",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
     end
 
   end