alchemy_cms 2.8.3 → 2.9.0

data/spec/dummy/db/schema.rb

@@ -268,37 +268,6 @@ ActiveRecord::Schema.define(:version => 20130827094554) do
   add_index "alchemy_sites", ["host", "public"], :name => "alchemy_sites_public_hosts_idx"
   add_index "alchemy_sites", ["host"], :name => "index_alchemy_sites_on_host"
 
-  create_table "alchemy_users", :force => true do |t|
-    t.string   "firstname"
-    t.string   "lastname"
-    t.string   "login"
-    t.string   "email"
-    t.string   "gender"
-    t.string   "roles",                                 :default => "registered"
-    t.string   "language"
-    t.string   "encrypted_password",     :limit => 128, :default => "",           :null => false
-    t.string   "password_salt",          :limit => 128, :default => "",           :null => false
-    t.integer  "sign_in_count",                         :default => 0,            :null => false
-    t.integer  "failed_attempts",                       :default => 0,            :null => false
-    t.datetime "last_request_at"
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.datetime "created_at",                                                      :null => false
-    t.datetime "updated_at",                                                      :null => false
-    t.integer  "creator_id"
-    t.integer  "updater_id"
-    t.text     "cached_tag_list"
-    t.string   "reset_password_token"
-    t.datetime "reset_password_sent_at"
-  end
-
-  add_index "alchemy_users", ["email"], :name => "index_alchemy_users_on_email", :unique => true
-  add_index "alchemy_users", ["login"], :name => "index_alchemy_users_on_login", :unique => true
-  add_index "alchemy_users", ["reset_password_token"], :name => "index_alchemy_users_on_reset_password_token", :unique => true
-  add_index "alchemy_users", ["roles"], :name => "index_alchemy_users_on_roles"
-
   create_table "events", :force => true do |t|
     t.string   "name"
     t.string   "hidden_name"

data/spec/features/admin/language_tree_feature_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe 'Language tree feature', js: true do
+
+  let(:klingonian) { FactoryGirl.create(:klingonian) }
+  let(:german_root) { FactoryGirl.create(:language_root_page) }
+  let(:klingonian_root) { FactoryGirl.create(:language_root_page, :name => 'Klingonian', :language => klingonian) }
+
+  before do
+    german_root
+    authorize_as_admin
+  end
+
+  context "in a multilangual environment" do
+    before { klingonian_root }
+
+    it "one should be able to switch the language tree" do
+      visit('/admin/pages')
+      page.select 'Klingonian', from: 'language_tree_select'
+      page.should have_selector('#sitemap', text: 'Klingonian')
+    end
+  end
+
+  context "with no language root page" do
+    before { klingonian }
+
+    it "it should display the form for creating language root" do
+      visit('/admin/pages')
+      page.select 'Klingonian', from: 'language_tree_select'
+      page.should have_content('This language tree does not exist')
+    end
+  end
+
+end

data/spec/features/admin/pages_controller_spec.rb

@@ -24,7 +24,7 @@ module Alchemy
         it "one should be able to switch the language tree" do
           visit('/admin/pages')
           page.select 'Klingonian', :from => 'language'
-          page.should have_selector('#sitemap', :text => 'Klingonian')
+          page.should have_selector('#sitemap .sitemap_pagename_link', :text => 'Klingonian')
         end
 
         after { Capybara.default_wait_time = 2 } # Reset to default

data/spec/features/pages_controller_spec.rb

@@ -109,7 +109,7 @@ module Alchemy
       context "in multi language mode" do
 
         before do
-          Config.stub!(:get) { |arg| arg == :url_nesting ? true : Config.parameter(arg) }
+          Config.stub(:get) { |arg| arg == :url_nesting ? true : Config.parameter(arg) }
           PagesController.any_instance.stub(:multi_language?).and_return(true)
         end
 
@@ -123,7 +123,7 @@ module Alchemy
         context "if requested page is unpublished" do
 
           before do
-            Config.stub!(:get) { |arg| arg == :url_nesting ? false : Config.parameter(arg) }
+            Config.stub(:get) { |arg| arg == :url_nesting ? false : Config.parameter(arg) }
             public_page_1.update_attributes(:public => false, :name => 'Not Public', :urlname => '')
             public_child
           end
@@ -170,7 +170,7 @@ module Alchemy
 
         context "wrong language requested" do
 
-          before { User.stub!(:admins).and_return([1, 2]) }
+          before { Alchemy.user_class.stub(:admins).and_return([1, 2]) }
 
           it "should render 404 if urlname and lang parameter do not belong to same page" do
             FactoryGirl.create(:english)
@@ -193,7 +193,7 @@ module Alchemy
 
         before do
           PagesController.any_instance.stub(:multi_language?).and_return(false)
-          Config.stub!(:get) { |arg| arg == :url_nesting ? false : Config.parameter(arg) }
+          Config.stub(:get) { |arg| arg == :url_nesting ? false : Config.parameter(arg) }
         end
 
         it "should redirect from nested language code url to normal url" do
@@ -237,7 +237,7 @@ module Alchemy
     describe "Handling of non-existing pages" do
 
       before do
-        User.stub!(:admins).and_return([1, 2]) # We need a admin user or the signup page will show up
+        Alchemy.user_class.stub(:admins).and_return([1, 2]) # We need a admin user or the signup page will show up
         visit "/non-existing-page"
       end
 
@@ -247,12 +247,5 @@ module Alchemy
 
     end
 
-    context "with invalid byte code char in urlname parameter" do
-      it "should render page not found" do
-        visit '/%ed'
-        page.status_code.should == 404
-      end
-    end
-
   end
 end

data/spec/features/picture_security_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe 'Picture renderung security', :js => true do
 
-  let(:picture) { Alchemy::Picture.create(:image_file => File.new(File.expand_path('../../support/image.png', __FILE__))) }
+  let(:picture) { Alchemy::Picture.create(:image_file => File.new(File.expand_path('../../fixtures/image.png', __FILE__))) }
 
   # Prevent the signup view from being rendered.
-  before { Alchemy::User.stub!(:count).and_return 1 }
+  before { Alchemy.user_class.stub(:count).and_return 1 }
 
   context "passing no security token" do
 

data/spec/features/security_spec.rb

@@ -1,51 +1,12 @@
 require 'spec_helper'
 
-describe "Security: " do
+describe "Security." do
+  before { Alchemy::Page.root.children.destroy_all }
 
-  before do
-    Alchemy::Page.root.children.destroy_all
-    Alchemy::User.delete_all
-  end
-
-  context "If no user is present" do
-
-    it "render the signup view" do
-      visit '/'
-      current_path.should == '/admin/signup'
-    end
-  end
-
-  context "If user is present" do
-
-    before do
-      create_admin_user
-    end
-
-    it "a visitor should not be able to signup" do
-      visit '/admin/signup'
-      within('#alchemy_greeting') { page.should_not have_content('have to signup') }
+  context "If user is not logged in" do
+    it "should see login form" do
+      visit '/admin/dashboard'
+      current_path.should == Alchemy.login_path
     end
-
-    context "that is not logged in" do
-      it "should see login-form" do
-        visit '/admin/dashboard'
-        current_path.should == '/admin/login'
-      end
-    end
-
-    context "that is already logged in" do
-
-      before do
-        login_into_alchemy
-      end
-
-      it "should be redirected to dashboard" do
-        visit '/admin/login'
-        current_path.should == '/admin/dashboard'
-      end
-
-    end
-
   end
-
 end

data/spec/features/translation_integration_spec.rb

@@ -1,57 +1,48 @@
 require 'spec_helper'
 
 describe "Translation integration" do
-
   context "in admin backend" do
-
-    before do
-      authorize_as_admin
-    end
+    before { authorize_as_admin(mock_model('User', alchemy_roles: %w(admin), role_symbols: [:admin], language: 'de', name: 'Peter')) }
 
     it "should be possible to set the locale of the admin backend via params" do
-      visit admin_dashboard_path(:locale => :de)
+      visit admin_dashboard_path(locale: 'de')
       page.should have_content('Willkommen')
     end
 
     it "should store the current locale in the session" do
-      visit admin_dashboard_path(:locale => :de)
+      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
-      visit admin_dashboard_path(:locale => :de)
+      visit admin_dashboard_path(locale: 'de')
       page.should have_content('Willkommen')
-      visit admin_dashboard_path(:locale => :en)
+      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
-      visit admin_dashboard_path(:locale => :ko)
-      page.should have_content('Welcome')
+    context 'with unknown locale' do
+      it "it uses the users default language" do
+        visit admin_dashboard_path(locale: 'ko')
+        page.should have_content('Willkommen')
+      end
     end
 
     context "if no other parameter is given" do
       it "should use the current users language setting" do
-        Alchemy::User.first.update_attributes!(language: 'de')
         visit admin_dashboard_path
         page.should have_content('Willkommen')
       end
     end
-
   end
 
   context "with translated header" do
-
-    before do
-      Capybara.current_driver = :rack_test_translated_header
-    end
+    before { Capybara.current_driver = :rack_test_translated_header }
 
     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/helpers/admin/base_helper_spec.rb

@@ -2,46 +2,35 @@ require 'spec_helper'
 
 module Alchemy
   describe Admin::BaseHelper do
-
     context "maximum amount of images option" do
+      subject { helper.max_image_count }
 
-      before(:each) do
-        @options = {}
-      end
-
-      context "with max_images option" do
-
-        it "should return nil for empty string" do
-          @options[:max_images] = ""
-          max_image_count.should be(nil)
-        end
-
-        it "should return an integer for string number" do
-          @options[:max_images] = "1"
-          max_image_count.should be(1)
-        end
+      before { helper.instance_variable_set('@options', options) }
 
+      context "with max_images option set to emtpy string" do
+        let(:options) { {max_images: ""} }
+        it { should eq(nil) }
       end
 
-      context "with maximum_amount_of_images option" do
-
-        it "should return nil for empty string" do
-          @options[:maximum_amount_of_images] = ""
-          max_image_count.should be(nil)
-        end
-
-        it "should return an integer for string number" do
-          @options[:maximum_amount_of_images] = "1"
-          max_image_count.should be(1)
-        end
+      context "with max_images option set to '1'" do
+        let(:options) { {max_images: "1"} }
+        it { should eq(1) }
+      end
 
+      context "with maximum_amount_of_images option set to emtpy string" do
+        let(:options) { {maximum_amount_of_images: ""} }
+        it { should eq(nil) }
       end
 
+      context "with maximum_amount_of_images option set to '1'" do
+        let(:options) { {maximum_amount_of_images: "1"} }
+        it { should eq(1) }
+      end
     end
 
     describe "#merge_params" do
-      before(:each) do
-        controller.stub!(:params).and_return({:first => '1', :second => '2'})
+      before do
+        controller.stub(:params).and_return({:first => '1', :second => '2'})
       end
 
       it "returns a hash that contains the current params and additional params given as attributes" do
@@ -50,9 +39,10 @@ module Alchemy
     end
 
     describe "#merge_params_without" do
-      before(:each) do
-        controller.stub!(:params).and_return({:first => '1', :second => '2'})
+      before do
+        controller.stub(:params).and_return({:first => '1', :second => '2'})
       end
+
       it "can delete a single param" do
         helper.merge_params_without(:second).should == {:first => '1'}
       end
@@ -72,9 +62,8 @@ module Alchemy
     end
 
     describe "#merge_params_only" do
-
-      before(:each) do
-        controller.stub!(:params).and_return({:first => '1', :second => '2', :third => '3'})
+      before do
+        controller.stub(:params).and_return({:first => '1', :second => '2', :third => '3'})
       end
 
       it "can keep a single param" do
@@ -93,7 +82,6 @@ module Alchemy
         helper.merge_params_only([:first])
         controller.params.should == {:first => '1', :second => '2', :third => '3'}
       end
-
     end
 
     describe '#toolbar_button' do
@@ -104,7 +92,7 @@ module Alchemy
 
         it "renders a toolbar button" do
           helper.toolbar_button(
-            url: admin_users_path
+            url: admin_dashboard_path
           ).should match /<div.+class="button_with_label/
         end
       end
@@ -116,7 +104,7 @@ module Alchemy
 
         it "returns empty string" do
           helper.toolbar_button(
-            url: admin_users_path
+            url: admin_dashboard_path
           ).should be_empty
         end
       end
@@ -128,7 +116,7 @@ module Alchemy
 
         it "returns the button" do
           helper.toolbar_button(
-            url: admin_users_path,
+            url: admin_dashboard_path,
             skip_permission_check: true
           ).should match /<div.+class="button_with_label/
         end
@@ -142,24 +130,24 @@ module Alchemy
         it "returns reads the permission from url" do
           helper.should_receive(:permission_array_from_url)
           helper.toolbar_button(
-            url: admin_users_path,
+            url: admin_dashboard_path,
             if_permitted_to: ''
           ).should_not be_empty
         end
       end
 
       context "with overlay option set to false" do
-        before {
+        before do
           helper.stub(:permitted_to?).and_return(true)
           helper.should_receive(:permission_array_from_url)
-        }
+        end
 
         it "renders a normal link" do
           button = helper.toolbar_button(
-            url: admin_users_path,
+            url: admin_dashboard_path,
             overlay: false
           )
-          button.should match /<a.+href="#{admin_users_path}"/
+          button.should match /<a.+href="#{admin_dashboard_path}"/
           button.should_not match /data-alchemy-overlay/
         end
       end

data/spec/helpers/admin/pages_helper_spec.rb

@@ -3,8 +3,10 @@ require 'spec_helper'
 describe Alchemy::Admin::PagesHelper do
 
   describe '#sitemap_folder_link' do
-    let(:user) { FactoryGirl.build_stubbed(:admin_user) }
-    before { helper.stub(:current_user).and_return(user) }
+    let(:user) { mock_model('User', alchemy_roles: %w(admin), role_symbols: [:admin]) }
+
+    before { helper.stub(:current_alchemy_user).and_return(user) }
+
     subject { helper.sitemap_folder_link(page) }
 
     context "with folded page" do