alchemy_cms 3.0.4 → 3.1.0.beta1

data/spec/features/admin/resources_integration_spec.rb

@@ -10,22 +10,22 @@ describe "Resources" do
 
     it "should have a button for creating a new resource items" do
       visit '/admin/events'
-      page.should have_selector('#toolbar div.button_with_label a.icon_button span.icon.create')
+      expect(page).to have_selector('#toolbar div.button_with_label a.icon_button span.icon.create')
     end
 
     it "should list existing items" do
       event
       second_event
       visit '/admin/events'
-      page.should have_content("My Event")
-      page.should have_content("something fancy")
-      page.should have_content("12.32")
+      expect(page).to have_content("My Event")
+      expect(page).to have_content("something fancy")
+      expect(page).to have_content("12.32")
     end
 
     it "should list existing resource-items nicely formatted" do
       event
       visit '/admin/events'
-      page.should have_selector('div#archive_all table.list')
+      expect(page).to have_selector('div#archive_all table.list')
     end
 
   end
@@ -33,16 +33,16 @@ describe "Resources" do
   describe "form for creating and updating items" do
     it "renders an input field according to the attribute's type" do
       visit '/admin/events/new'
-      page.should have_selector('input#event_name[type="text"]')
-      page.should have_selector('input#event_starts_at[type="date"]')
-      page.should have_selector('textarea#event_description')
-      page.should have_selector('input#event_published[type="checkbox"]')
+      expect(page).to have_selector('input#event_name[type="text"]')
+      expect(page).to have_selector('input#event_starts_at[type="date"]')
+      expect(page).to have_selector('textarea#event_description')
+      expect(page).to have_selector('input#event_published[type="checkbox"]')
     end
 
     it "should have a select box for associated models" do
       visit '/admin/events/new'
       within('form') do
-        page.should have_selector('select')
+        expect(page).to have_selector('select')
       end
     end
   end
@@ -58,12 +58,12 @@ describe "Resources" do
       end
 
       it "lists the new item" do
-        page.should have_content "My second event"
-        page.should have_content "03 Mar 2012"
+        expect(page).to have_content "My second event"
+        expect(page).to have_content "03 Mar 2012"
       end
 
       it "shows a success message" do
-        page.should have_content("Succesfully created")
+        expect(page).to have_content("Succesfully created")
       end
     end
 
@@ -75,15 +75,15 @@ describe "Resources" do
       end
 
       it "shows the form again" do
-        page.should have_selector "form input#event_name"
+        expect(page).to have_selector "form input#event_name"
       end
 
       it "lists invalid fields" do
-        page.should have_content("can't be blank")
+        expect(page).to have_content("can't be blank")
       end
 
       it "should not display success notice" do
-        page.should_not have_content("successfully created")
+        expect(page).not_to have_content("successfully created")
       end
     end
 
@@ -97,11 +97,11 @@ describe "Resources" do
     end
 
     it "shows the updated value" do
-      page.should have_content("New event name")
+      expect(page).to have_content("New event name")
     end
 
     it "shows a success message" do
-      page.should have_content("Succesfully updated")
+      expect(page).to have_content("Succesfully updated")
     end
   end
 
@@ -116,12 +116,12 @@ describe "Resources" do
     end
 
     it "shouldn't be on the list anymore" do
-      page.should have_content "My Event"
-      page.should_not have_content "My second Event"
+      expect(page).to have_content "My Event"
+      expect(page).not_to have_content "My second Event"
     end
 
     it "should display success message" do
-      page.should have_content("Succesfully removed")
+      expect(page).to have_content("Succesfully removed")
     end
   end
 

data/spec/features/admin/tinymce_feature_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe 'TinyMCE Editor' do
+  let(:user) { DummyUser.new }
+
+  before do
+    user.update(alchemy_roles: %w(admin), name: "Joe User", id: 1)
+    authorize_as_admin(user)
+  end
+
+  it 'base path should be set to tinymce asset folder' do
+    visit admin_dashboard_path
+    expect(page).to have_content <<-TINYMCE
+var tinyMCEPreInit = {
+  base: '/assets/tinymce',
+  suffix: '.min'
+};
+TINYMCE
+  end
+
+  context 'with asset host' do
+    before do
+      expect(ActionController::Base.config).to receive(:asset_host_set?).and_return(true)
+    end
+
+    it 'base path should be set to tinymce asset folder' do
+      visit admin_dashboard_path
+      expect(page).to have_content <<-TINYMCE
+var tinyMCEPreInit = {
+  base: 'http://www.example.com/assets/tinymce',
+  suffix: '.min'
+};
+TINYMCE
+    end
+  end
+end

data/spec/features/navigation_spec.rb

@@ -4,6 +4,6 @@ describe "Dummy App" do
   include Capybara::DSL
 
   it "should be a valid app" do
-    ::Rails.application.should be_a(Dummy::Application)
+    expect(::Rails.application).to be_a(Dummy::Application)
   end
 end

data/spec/features/page_feature_spec.rb

@@ -14,7 +14,7 @@ module Alchemy
       article = p.elements.find_by_name('article')
       article.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop', :public => true)
       visit "/#{p.urlname}"
-      within('div#content div.article div.intro') { page.should have_content('Welcome to Peters Petshop') }
+      within('div#content div.article div.intro') { expect(page).to have_content('Welcome to Peters Petshop') }
     end
 
     it "should show the navigation with all visible pages" do
@@ -23,39 +23,39 @@ module Alchemy
         FactoryGirl.create(:public_page, :visible => true, :name => 'Page 2')
       ]
       visit '/'
-      within('div#navigation ul') { page.should have_selector('li a[href="/page-1"], li a[href="/page-2"]') }
+      within('div#navigation ul') { expect(page).to have_selector('li a[href="/page-1"], li a[href="/page-2"]') }
     end
 
     describe "redirecting" do
       context "in multi language mode" do
         before do
-          Config.stub(:get) { |arg| arg == :url_nesting ? true : Config.parameter(arg) }
-          PagesController.any_instance.stub(:multi_language?).and_return(true)
+          allow(Config).to receive(:get) { |arg| arg == :url_nesting ? true : Config.parameter(arg) }
+          allow_any_instance_of(PagesController).to receive(:multi_language?).and_return(true)
         end
 
         context "if no language params are given" do
           it "should redirect to url with nested language code" do
             visit "/#{public_page_1.urlname}"
-            page.current_path.should == "/#{public_page_1.language_code}/#{public_page_1.urlname}"
+            expect(page.current_path).to eq("/#{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) }
+            allow(Config).to receive(:get) { |arg| arg == :url_nesting ? false : Config.parameter(arg) }
             public_page_1.update_attributes(:public => false, :name => 'Not Public', :urlname => '')
             public_child
           end
 
           it "should redirect to public child" do
             visit "/#{default_language.code}/not-public"
-            page.current_path.should == "/#{default_language.code}/public-child"
+            expect(page.current_path).to eq("/#{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 '/not-public'
-              page.current_path.should == "/#{default_language.code}/public-child"
+              expect(page.current_path).to eq("/#{default_language.code}/public-child")
             end
           end
         end
@@ -63,56 +63,56 @@ module Alchemy
         context "if requested url is index url" do
           it "should redirect to pages url with default language" do
             visit '/'
-            page.current_path.should == "/#{default_language.code}/home"
+            expect(page.current_path).to eq("/#{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 "/#{default_language.code}"
-            page.current_path.should == "/#{default_language.code}/home"
+            expect(page.current_path).to eq("/#{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 '/home'
-            page.current_path.should == '/en/home'
+            expect(page.current_path).to eq('/en/home')
           end
         end
 
         it "should keep additional params" do
           visit "/#{public_page_1.urlname}?query=Peter"
-          page.current_url.should match(/\?query=Peter/)
+          expect(page.current_url).to match(/\?query=Peter/)
         end
 
         context "wrong language requested" do
-          before { Alchemy.user_class.stub(:admins).and_return([1, 2]) }
+          before { allow(Alchemy.user_class).to receive(:admins).and_return([1, 2]) }
 
           it "should render 404 if urlname and lang parameter do not belong to same page" do
             FactoryGirl.create(:klingonian)
             visit "/kl/#{public_page_1.urlname}"
-            page.status_code.should == 404
+            expect(page.status_code).to eq(404)
           end
 
           it "should render 404 if requested language does not exist" do
             public_page_1
             LegacyPageUrl.delete_all
             visit "/fo/#{public_page_1.urlname}"
-            page.status_code.should == 404
+            expect(page.status_code).to eq(404)
           end
         end
       end
 
       context "not in multi language mode" do
         before do
-          PagesController.any_instance.stub(:multi_language?).and_return(false)
-          Config.stub(:get) { |arg| arg == :url_nesting ? false : Config.parameter(arg) }
+          allow_any_instance_of(PagesController).to receive(:multi_language?).and_return(false)
+          allow(Config).to receive(:get) { |arg| arg == :url_nesting ? false : Config.parameter(arg) }
         end
 
         it "should redirect from nested language code url to normal url" do
           visit "/en/#{public_page_1.urlname}"
-          page.current_path.should == "/#{public_page_1.urlname}"
+          expect(page.current_path).to eq("/#{public_page_1.urlname}")
         end
 
         context "should redirect to public child" do
@@ -123,35 +123,35 @@ module Alchemy
 
           it "if requested page is unpublished" do
             visit '/not-public'
-            page.current_path.should == '/public-child'
+            expect(page.current_path).to eq('/public-child')
           end
 
           it "with normal url, if requested url has nested language code and is not public" do
             visit '/en/not-public'
-            page.current_path.should == '/public-child'
+            expect(page.current_path).to eq('/public-child')
           end
         end
 
         it "should redirect to pages url, if requested url is index url" do
           visit '/'
-          page.current_path.should == '/home'
+          expect(page.current_path).to eq('/home')
         end
 
         it "should keep additional params" do
           visit "/de/#{public_page_1.urlname}?query=Peter"
-          page.current_url.should match(/\?query=Peter/)
+          expect(page.current_url).to match(/\?query=Peter/)
         end
       end
     end
 
     describe "Handling of non-existing pages" do
       before do
-        Alchemy.user_class.stub(:admins).and_return([1, 2]) # We need a admin user or the signup page will show up
+        allow(Alchemy.user_class).to receive(:admins).and_return([1, 2]) # We need a admin user or the signup page will show up
         visit "/non-existing-page"
       end
 
       it "should render public/404.html" do
-        page.status_code.should == 404
+        expect(page.status_code).to eq(404)
       end
     end
 
@@ -165,7 +165,7 @@ module Alchemy
       context "rendering for guest users" do
         it "is prohibited" do
           visit "/#{public_page_1.urlname}"
-          within('body') { page.should_not have_selector('#alchemy_menubar') }
+          within('body') { expect(page).not_to have_selector('#alchemy_menubar') }
         end
       end
 
@@ -173,7 +173,7 @@ module Alchemy
         it "is prohibited" do
           authorize_as_admin(mock_model('DummyUser', alchemy_roles: %w(member), language: 'en'))
           visit "/#{public_page_1.urlname}"
-          within('body') { page.should_not have_selector('#alchemy_menubar') }
+          within('body') { expect(page).not_to have_selector('#alchemy_menubar') }
         end
       end
 
@@ -181,7 +181,7 @@ module Alchemy
         it "is allowed" do
           authorize_as_admin(mock_model('DummyUser', alchemy_roles: %w(author), language: 'en', cache_key: 'aaa'))
           visit "/#{public_page_1.urlname}"
-          within('body') { page.should have_selector('#alchemy_menubar') }
+          within('body') { expect(page).to have_selector('#alchemy_menubar') }
         end
       end
 
@@ -189,7 +189,7 @@ module Alchemy
         it "is allowed" do
           authorize_as_admin(mock_model('DummyUser', alchemy_roles: %w(editor), language: 'en', cache_key: 'aaa'))
           visit "/#{public_page_1.urlname}"
-          within('body') { page.should have_selector('#alchemy_menubar') }
+          within('body') { expect(page).to have_selector('#alchemy_menubar') }
         end
       end
 
@@ -197,7 +197,7 @@ module Alchemy
         it "is allowed" do
           authorize_as_admin(mock_model('DummyUser', alchemy_roles: %w(admin), language: 'en', cache_key: 'aaa'))
           visit "/#{public_page_1.urlname}"
-          within('body') { page.should have_selector('#alchemy_menubar') }
+          within('body') { expect(page).to have_selector('#alchemy_menubar') }
         end
       end
 
@@ -208,15 +208,15 @@ module Alchemy
         end
 
         it "a link to the admin area" do
-          within('#alchemy_menubar') { page.should have_selector("li a[href='#{alchemy.admin_dashboard_path}']") }
+          within('#alchemy_menubar') { expect(page).to have_selector("li a[href='#{alchemy.admin_dashboard_path}']") }
         end
 
         it "a link to edit the current page" do
-          within('#alchemy_menubar') { page.should have_selector("li a[href='#{alchemy.edit_admin_page_path(public_page_1)}']") }
+          within('#alchemy_menubar') { expect(page).to have_selector("li a[href='#{alchemy.edit_admin_page_path(public_page_1)}']") }
         end
 
         it "a form and button to logout of alchemy" do
-          within('#alchemy_menubar') { page.should have_selector("li form[action='#{Alchemy.logout_path}'], li button[type='submit']") }
+          within('#alchemy_menubar') { expect(page).to have_selector("li form[action='#{Alchemy.logout_path}'], li button[type='submit']") }
         end
       end
     end
@@ -240,7 +240,7 @@ module Alchemy
       context 'as a guest user' do
         it "I am not able to visit the page" do
           visit restricted_page.urlname
-          current_path.should == Alchemy.login_path
+          expect(current_path).to eq(Alchemy.login_path)
         end
       end
 
@@ -249,7 +249,7 @@ module Alchemy
 
         it "I am able to visit the page" do
           visit restricted_page.urlname
-          current_path.should == "/#{restricted_page.urlname}"
+          expect(current_path).to eq("/#{restricted_page.urlname}")
         end
       end
     end

data/spec/features/picture_security_spec.rb

@@ -5,13 +5,13 @@ describe 'Picture renderung security', :js => true do
   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_class.stub(:count).and_return 1 }
+  before { allow(Alchemy.user_class).to receive(:count).and_return 1 }
 
   context "passing no security token" do
 
     it 'should return a bad request (400)' do
       visit "/pictures/#{picture.id}/show/image.png"
-      page.status_code.should == 400
+      expect(page.status_code).to eq(400)
     end
 
   end
@@ -23,11 +23,11 @@ describe 'Picture renderung security', :js => true do
     end
 
     it 'should return image' do
-      page.body.should match(/img/)
+      expect(page.body).to match(/img/)
     end
 
     it 'should return status ok (200)' do
-      page.status_code.should == 200
+      expect(page.status_code).to eq(200)
     end
 
   end

data/spec/features/security_spec.rb

@@ -6,7 +6,7 @@ describe "Security." do
   context "If user is not logged in" do
     it "should see login form" do
       visit '/admin/dashboard'
-      current_path.should == Alchemy.login_path
+      expect(current_path).to eq(Alchemy.login_path)
     end
   end
 end

data/spec/features/translation_integration_spec.rb

@@ -6,33 +6,33 @@ describe "Translation integration" do
 
     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')
+      expect(page).to have_content('Willkommen')
     end
 
     it "should store the current locale in the session" do
       visit admin_dashboard_path(locale: 'de')
       visit admin_dashboard_path
-      page.should have_content('Willkommen')
+      expect(page).to have_content('Willkommen')
     end
 
     it "should be possible to change the current locale in the session" do
       visit admin_dashboard_path(locale: 'de')
-      page.should have_content('Willkommen')
+      expect(page).to have_content('Willkommen')
       visit admin_dashboard_path(locale: 'en')
-      page.should have_content('Welcome')
+      expect(page).to have_content('Welcome')
     end
 
     context 'with unknown locale' do
       it "it uses the users default language" do
         visit admin_dashboard_path(locale: 'ko')
-        page.should have_content('Willkommen')
+        expect(page).to have_content('Willkommen')
       end
     end
 
     context "if no other parameter is given" do
       it "should use the current users language setting" do
         visit admin_dashboard_path
-        page.should have_content('Willkommen')
+        expect(page).to have_content('Willkommen')
       end
     end
 
@@ -41,7 +41,7 @@ describe "Translation integration" do
 
       it "should use the browsers language setting if no other parameter is given" do
         visit admin_dashboard_path
-        page.should have_content('Willkommen')
+        expect(page).to have_content('Willkommen')
       end
     end
   end