refinerycms-core 2.1.5 → 3.0.0

data/refinerycms-core.gemspec

@@ -2,7 +2,7 @@
 require File.expand_path('../../core/lib/refinery/version', __FILE__)
 
 version = Refinery::Version.to_s
-rails_version = ['>= 3.1.11', '< 3.3'] | 0.upto(11).map{|i| "!= 3.2.#{i}"}
+rails_version = ['>= 4.2.3', '< 5.0']
 
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version           = version
   s.summary           = %q{Core extension for Refinery CMS}
   s.description       = %q{The core of Refinery CMS. This handles the common functionality and is required by most extensions}
-  s.email             = %q{info@refinerycms.com}
+  s.email             = %q{refinerycms@p.arndt.io}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
   s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
@@ -20,16 +20,19 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = Refinery::Version.required_ruby_version
 
-  s.add_dependency 'refinerycms-i18n',            '~> 2.1.0'
-  s.add_dependency 'awesome_nested_set',          '~> 2.1.3'
+  s.add_dependency 'refinerycms-i18n',            '~> 3.0.0'
+  s.add_dependency 'awesome_nested_set',          '~> 3.0.0'
   s.add_dependency 'railties',                    rails_version
   s.add_dependency 'activerecord',                rails_version
   s.add_dependency 'actionpack',                  rails_version
   s.add_dependency 'truncate_html',               '~> 0.9'
   s.add_dependency 'will_paginate',               '~> 3.0.2'
-  s.add_dependency 'sass-rails',                  '~> 3.2.3'
-  s.add_dependency 'jquery-rails',                '~> 2.3.0'
-  s.add_dependency 'decorators',                  '~> 1.0.0'
+  s.add_dependency 'sass-rails',                  '>= 4.0', '< 5.1'
+  s.add_dependency 'coffee-rails',                ['~> 4.0', '>= 4.0.0']
+  s.add_dependency 'jquery-rails',                '>= 2.3.0'
+  s.add_dependency 'jquery-ui-rails',             '~> 5.0.0'
+  s.add_dependency 'decorators',                  '~> 2.0.0'
+  s.add_dependency 'zilch-authorisation'
 end

data/spec/controllers/refinery/admin/dummy_controller_spec.rb

@@ -12,41 +12,53 @@ end
 
 module Refinery
   module Admin
-    describe DummyController do
+    describe DummyController, :type => :controller do
+      before do
+        @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
+          r.draw do
+            namespace :refinery do
+              namespace :admin do
+                resources :dummy
+              end
+            end
+          end
+        end
+      end
+
       context "as refinery user" do
-        refinery_login_with :refinery
+        refinery_login
 
         context "with permission" do
-          let(:controller_permission) { true }
           it "allows access" do
-            controller.should_not_receive :error_404
+            allow(controller).to receive(:allow_controller?).and_return(true)
+            expect(controller).not_to receive :error_404
             get :index
           end
         end
 
         context "without permission" do
-          let(:controller_permission) { false }
           it "denies access" do
-            controller.should_receive :error_404
+            allow(controller).to receive(:allow_controller?).and_return(false)
+            expect(controller).to receive :error_404
             get :index
           end
         end
 
         describe "force_ssl!" do
           before do
-            controller.stub(:require_refinery_users!).and_return(false)
+            allow(controller).to receive(:require_refinery_users!).and_return(false)
           end
 
           it "is false so standard HTTP is used" do
-            Refinery::Core.stub(:force_ssl).and_return(false)
-            controller.should_not_receive(:redirect_to).with(:protocol => 'https')
+            allow(Refinery::Core).to receive(:force_ssl).and_return(false)
+            expect(controller).not_to receive(:redirect_to).with(:protocol => 'https')
 
             get :index
           end
 
           it "is true so HTTPS is used" do
-            Refinery::Core.stub(:force_ssl).and_return(true)
-            controller.should_receive(:redirect_to).with(:protocol => 'https')
+            allow(Refinery::Core).to receive(:force_ssl).and_return(true)
+            expect(controller).to receive(:redirect_to).with(:protocol => 'https')
 
             get :index
           end

data/spec/controllers/refinery/sitemap_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Refinery
-  describe SitemapController do
+  describe SitemapController, :type => :controller do
     before (:each) do
       @request.env['HTTP_ACCEPT'] = 'application/xml'
     end
@@ -9,7 +9,7 @@ module Refinery
     it "shows a valid xml response" do
       get :index
 
-      response.should be_success
+      expect(response).to be_success
     end
   end
 end

data/spec/features/refinery/admin/custom_assets_spec.rb

@@ -1,30 +1,32 @@
 require "spec_helper"
 
 module Refinery
-  describe "custom" do
-    refinery_login_with :refinery_user
+  describe "custom", :type => :feature do
+    refinery_login
+    after do
+      Refinery::Core.javascripts.reject! { |j| %w[custom_js].include?(j) }
+      Refinery::Core.stylesheets.reject! { |s| %w[custom_css].include?(s.path) }
+    end
 
     context "javascripts" do
       before do
-        ::Refinery::Core.clear_javascripts!
+        ::Refinery::Core.config.register_javascript('custom_js')
       end
 
       it "should be rendered when specified" do
-        ::Refinery::Core.config.register_javascript('custom_js')
-        visit refinery.admin_dashboard_path
-        page.body.include?('custom_js.js').should be
+        visit Refinery::Core.backend_path
+        expect(page.body.include?('custom_js.js')).to be
       end
     end
 
     context "stylesheets" do
       before do
-        ::Refinery::Core.clear_stylesheets!
+        ::Refinery::Core.config.register_stylesheet('custom_css')
       end
 
       it "should be rendered when specified" do
-        ::Refinery::Core.config.register_stylesheet('custom_css')
-        visit refinery.admin_dashboard_path
-        page.body.include?('custom_css.css').should be
+        visit Refinery::Core.backend_path
+        expect(page.body).to include('custom_css.css')
       end
     end
 

data/spec/features/refinery/admin/dialogs_spec.rb

@@ -1,26 +1,26 @@
 require "spec_helper"
 
 module Refinery
-  describe "dialog" do
-    refinery_login_with :refinery_user
+  describe "dialog", :type => :feature do
+    refinery_login
 
     context "links" do
       it "have iframe src" do
         visit refinery.admin_dialog_path('Link')
-        page.should have_selector("iframe[src='/refinery/pages_dialogs/link_to']")
+        expect(page).to have_selector("iframe[src='/refinery/pages_dialogs/link_to']")
       end
     end
 
     context "images" do
       it "have iframe src" do
         visit refinery.admin_dialog_path('Image')
-        page.should have_selector("iframe[src='/refinery/images/insert?modal=true']")
+        expect(page).to have_selector("iframe[src='/refinery/images/insert?modal=true']")
       end
     end
 
     context "a" do
       it "404s" do
-        Admin::DialogsController.any_instance.should_receive(:error_404).once
+        expect_any_instance_of(Admin::DialogsController).to receive(:error_404).once
 
         visit refinery.admin_dialog_path('a')
       end

data/spec/features/refinery/admin/xhr_paging_spec.rb

@@ -1,53 +1,39 @@
 require "spec_helper"
 
 module Refinery
-  describe "Crudify" do
-    refinery_login_with :refinery_superuser
+  describe "Crudify", type: :feature do
+    refinery_login
+
+    describe "xhr_paging", :js do
+      # Refinery::Admin::ImagesController specifies :order => 'created_at DESC' in crudify
+      let(:first_image) { Image.order('created_at DESC').first }
+      let(:last_image) { Image.order('created_at DESC').last }
+      let!(:image_1) { FactoryGirl.create :image }
+      let!(:image_2) { FactoryGirl.create :image }
 
-    describe "xhr_paging", :js => true do
-      # Refinery::Admin::UsersController specifies :order => 'username ASC' in crudify
-      let(:first_user) { User.order('username ASC').first }
-      let(:last_user) { User.order('username ASC').last }
       before do
-        FactoryGirl.create :user
-        Admin::UsersController.should_receive(:xhr_pageable?).
-                               at_least(1).times.and_return(xhr_pageable)
-        User.stub(:per_page).and_return(1)
+        allow(Image).to receive(:per_page).and_return(1)
       end
 
-      describe 'when set to true' do
-        let(:xhr_pageable) { true }
-        it 'should perform ajax paging of index' do
-          visit refinery.admin_users_path
+      it 'performs ajax paging of index' do
+        visit refinery.admin_images_path
 
-          expect(page).to have_selector('li.record', :count => 1)
-          expect(page).to have_content(first_user.email)
+        expect(page).to have_selector('ul#image_grid li > img', count: 1)
+        expect(page).to have_css(%Q{img[alt="#{first_image.title}"]})
 
-          within '.pagination' do
-            click_link '2'
-          end
+        # placeholder which would disappear in a full page refresh.
+        page.evaluate_script(
+          %{$('body').append('<i id="has_not_refreshed_entire_page"/>')}
+        )
 
-          expect(page.evaluate_script('jQuery.active')).to eq(1)
-          expect(page).to have_content(last_user.email)
+        within '.pagination' do
+          click_link '2'
         end
-      end
-
-      describe 'set to false' do
-        let(:xhr_pageable) { false }
-        it 'should not perform ajax paging of index' do
-          visit refinery.admin_users_path
-
-          expect(page).to have_selector('li.record', :count => 1)
-          expect(page).to have_content(first_user.email)
 
-          within '.pagination' do
-            click_link '2'
-          end
-
-          expect(page.evaluate_script('jQuery.active')).to eq(0)
-          expect(page).to have_content(last_user.email)
-
-        end
+        expect(page).to have_css(%Q{img[alt="#{last_image.title}"]})
+        expect(page.evaluate_script(
+          %{$('i#has_not_refreshed_entire_page').length}
+        )).to eq(1)
       end
     end
   end

data/spec/features/refinery/application_layout_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 module Refinery
-  describe 'layout' do
-    refinery_login_with :refinery_user
+  describe 'layout', :type => :feature do
+    refinery_login
 
     let(:home_page) do
       FactoryGirl.create :page, :title => 'Home', :link_url => '/'
@@ -12,7 +12,7 @@ module Refinery
       it "id is the page's canonical id" do
         visit home_page.url
 
-        page.should have_css 'body#home-page'
+        expect(page).to have_css 'body#home-page'
       end
     end
   end

data/spec/features/refinery/core_spec.rb

@@ -1,6 +1,6 @@
 module Refinery
   module Core
-    describe Engine do
+    describe Engine, :type => :feature do
       describe "#refinery_inclusion!" do
         it "should be idempotent" do
           expect { visit(refinery.root_path) }.to_not raise_error

data/spec/features/refinery/site_bar_spec.rb

@@ -1,49 +1,70 @@
 require "spec_helper"
 
 module Refinery
-  describe "site bar" do
-    refinery_login_with :refinery_user
+  describe "site bar", :type => :feature do
+    refinery_login
 
-    it "have logout link" do
-      visit refinery.admin_dashboard_path
+    describe "logout link" do
+      let(:logout_path) { '/refinery/logout' }
 
-      page.should have_content("Log out")
-      page.should have_selector("a[href='/refinery/logout']")
+      context "when set" do
+        before do
+          allow(Refinery::Core).to receive(:refinery_logout_path).and_return(logout_path)
+          visit Refinery::Core.backend_path
+        end
+
+        it "is present" do
+          expect(page).to have_selector("a[href='#{logout_path}']")
+          expect(page).to have_content("Log out")
+        end
+      end
+
+      context "when not set" do
+        it "is not present" do
+          visit Refinery::Core.backend_path
+          expect(page).not_to have_content("Log out")
+          expect(page).not_to have_selector("a[href='#{logout_path}']")
+        end
+      end
     end
 
     context "when in backend" do
-      before { visit refinery.admin_dashboard_path }
+      before do
+        visit Refinery::Core.backend_path
+      end
 
-      it "have a 'switch to your website button'" do
-        page.should have_content("Switch to your website")
-        page.should have_selector("a[href='/']")
+      it "has a 'switch to your website button'" do
+        expect(page).to have_content("Switch to your website")
+        expect(page).to have_selector("a[href='/']")
       end
 
       it "switches to frontend" do
-        page.current_path.should == refinery.admin_dashboard_path
+        expect(page.current_path).to match(/\A#{Refinery::Core.backend_path}/)
         click_link "Switch to your website"
-        page.current_path.should == refinery.root_path
+        expect(page.current_path).to eq(refinery.root_path)
       end
     end
 
     context "when in frontend" do
-      before do
-        # make a page in order to avoid 404
-        FactoryGirl.create(:page, :link_url => "/")
-
-        visit refinery.root_path
-      end
+      # make a page in order to avoid 404
+      let!(:root_page) { FactoryGirl.create(:page, :link_url => "/") }
+      before { visit refinery.root_path }
 
-      it "have a 'switch to your website editor' button" do
-        page.should have_content("Switch to your website editor")
-        page.should have_selector("a[href='/refinery']")
+      it "has a 'switch to your website editor' button" do
+        expect(page).to have_content("Switch to your website editor")
+        expect(page).to have_selector("a[href='/refinery']")
       end
 
       it "switches to backend" do
-        page.current_path.should == refinery.root_path
+        expect(page.current_path).to eq(refinery.root_path)
         click_link "Switch to your website editor"
-        page.current_path.should == refinery.admin_root_path
+        expect(page.current_path).to match(/\A#{Refinery::Core.backend_path}/)
       end
+
+      it "has an 'edit this page' button" do
+        expect(page).to have_link("Edit this page", :href => refinery.edit_admin_page_path(root_page))
+      end
+
     end
   end
 end

data/spec/helpers/refinery/admin_helper_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+module Refinery
+  describe AdminHelper, :type => :helper do
+    describe "locale_country" do
+      it "should return the second part of a dialect" do
+        expect(helper.locale_country('zh-TW')).to eq("TW")
+      end
+
+      it "should return the locale if it is not a dialect" do
+        expect(helper.locale_country('en')).to eq("EN")
+      end
+    end
+  end
+end

data/spec/helpers/refinery/custom_assets_helper_spec.rb

@@ -1,52 +1,44 @@
 require "spec_helper"
 
 module Refinery
-  describe CustomAssetsHelper do
-    describe "custom_javascripts" do
-      before do
-        Refinery::Core.clear_javascripts!
-      end
+  describe CustomAssetsHelper, :type => :helper do
+    def clear_assets_used_by_spec
+      Refinery::Core.javascripts.reject! {|j| %w[test parndt].include?(j) }
+      Refinery::Core.stylesheets.reject! {|s| %w[test parndt].include?(s.path) }
+    end
 
+    before { clear_assets_used_by_spec }
+    after { clear_assets_used_by_spec }
+
+    describe "custom_javascripts" do
       it "should return one custom javascript in array when one javascript is registred" do
         Refinery::Core.config.register_javascript("test")
-        helper.custom_javascripts.should eq ["test"]
+        expect(helper.custom_javascripts.last).to eq("test")
       end
 
       it "should return two custom javascripts in array when two javascripts are registred" do
         Refinery::Core.config.register_javascript("test")
         Refinery::Core.config.register_javascript("parndt")
-        helper.custom_javascripts.should eq ["test", "parndt"]
-      end
-
-      it "should return empty array when no javascript is registred" do
-        helper.custom_javascripts.should eq []
+        expect(helper.custom_javascripts).to include("test", "parndt")
       end
     end
 
     describe "custom_stylesheets" do
-      before do
-        Refinery::Core.clear_stylesheets!
-      end
-
       it "should return one custom stylesheet class in array when one stylesheet is registred" do
         Refinery::Core.config.register_stylesheet("test")
-        helper.custom_stylesheets.first.path.should eq "test"
+        expect(helper.custom_stylesheets.last.path).to eq("test")
       end
 
       it "should return two custom stylesheet classes in array when two stylesheets are registred" do
         Refinery::Core.config.register_stylesheet("test")
         Refinery::Core.config.register_stylesheet("parndt")
-        helper.custom_stylesheets.collect(&:path).should eq ["test", "parndt"]
-      end
-
-      it "should return empty array when no stylesheet is registred" do
-        helper.custom_stylesheets.should eq []
+        expect(helper.custom_stylesheets.map(&:path)).to include("test", "parndt")
       end
 
       it "should return stylesheet class with path and options when both are specified" do
         Refinery::Core.config.register_stylesheet("test", :media => 'screen')
-        helper.custom_stylesheets.first.path.should eq("test")
-        helper.custom_stylesheets.first.options.should eq({:media => 'screen'})
+        expect(helper.custom_stylesheets.last.path).to eq("test")
+        expect(helper.custom_stylesheets.last.options).to eq({:media => 'screen'})
       end
     end
   end