refinerycms-core 2.1.5 → 3.0.0

data/spec/lib/refinery/authorisation_manager_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper_no_rails'
+require 'refinery/core/authorisation_manager'
+
+module Refinery
+  module Core
+    RSpec.describe AuthorisationManager do
+      subject { Refinery::Core::AuthorisationManager.new }
+    end
+  end
+end

data/spec/lib/refinery/cli_spec.rb

@@ -11,24 +11,59 @@ describe "CLI" do
     Rake::Task.define_task(:environment)
   end
 
+  context "rake refinery:override:list" do
+    it "shows info message" do
+      msg = capture { rake["refinery:override:list"].invoke }
+
+      expect(msg).to include("You didn't specify a valid type to list overrides for.  Here are some examples:")
+
+      expect(msg).to include("type=view")
+      expect(msg).to include("view=pages/home")
+      expect(msg).to include("view=refinery/pages/home")
+      expect(msg).to include("view=layouts/application")
+
+      expect(msg).to include("type=javascript")
+      expect(msg).to include("javascript=admin")
+      expect(msg).to include("javascript=refinery/site_bar")
+      expect(msg).to include("javascript=refinery**/{**/}*")
+
+      expect(msg).to include("type=stylesheet")
+      expect(msg).to include("stylesheet=home")
+      expect(msg).to include("stylesheet=refinery/site_bar")
+
+      expect(msg).to include("type=controller")
+      expect(msg).to include("controller=pages")
+
+      expect(msg).to include("type=model")
+      expect(msg).to include("model=page")
+      expect(msg).to include("model=refinery/page")
+
+      expect(msg).to include("type=helper")
+      expect(msg).to include("helper=site_bar")
+      expect(msg).to include("helper=refinery/site_bar_helper")
+
+      expect(msg).to include("type=presenter")
+      expect(msg).to include("presenter=refinery/page_presenter")
+    end
+  end
+
   context "when called with no args" do
     it "shows info message" do
-      msg = capture(:stdout) { rake["refinery:override"].invoke }
-
-      msg.should match("You didn't specify anything valid to override. Here are some examples:")
-      msg.should match("rake refinery:override view=pages/home")
-      msg.should match("rake refinery:override view=refinery/pages/home")
-      msg.should match(%r{rake refinery:override view=\*\*/\*menu})
-      msg.should match("rake refinery:override view=_menu_branch")
-      msg.should match("rake refinery:override javascript=admin")
-      msg.should match("rake refinery:override javascript=refinery/site_bar")
-      msg.should match("rake refinery:override stylesheet=home")
-      msg.should match("rake refinery:override stylesheet=refinery/site_bar")
-      msg.should match("rake refinery:override controller=pages")
-      msg.should match("rake refinery:override model=page")
-      msg.should match("rake refinery:override model=refinery/page")
-      msg.should match("rake refinery:override helper=site_bar")
-      msg.should match("rake refinery:override helper=refinery/site_bar_helper")
+      msg = capture { rake["refinery:override"].invoke }
+
+      expect(msg).to include("You didn't specify anything valid to override. Here are some examples:")
+      expect(msg).to include("rake refinery:override view=pages/home")
+      expect(msg).to include("rake refinery:override view=refinery/pages/home")
+      expect(msg).to include("rake refinery:override view=layouts/application")
+      expect(msg).to include("rake refinery:override javascript=admin")
+      expect(msg).to include("rake refinery:override javascript=refinery/site_bar")
+      expect(msg).to include("rake refinery:override stylesheet=home")
+      expect(msg).to include("rake refinery:override stylesheet=refinery/site_bar")
+      expect(msg).to include("rake refinery:override controller=pages")
+      expect(msg).to include("rake refinery:override model=page")
+      expect(msg).to include("rake refinery:override model=refinery/page")
+      expect(msg).to include("rake refinery:override helper=site_bar")
+      expect(msg).to include("rake refinery:override helper=refinery/site_bar_helper")
     end
   end
 
@@ -39,9 +74,9 @@ describe "CLI" do
       it "shows message" do
         ENV[env] = "non-existent"
 
-        msg = capture(:stdout) { rake["refinery:override"].invoke }
+        msg = capture { rake["refinery:override"].invoke }
 
-        msg.should include(not_found_message)
+        expect(msg).to include(not_found_message)
       end
     end
 
@@ -58,12 +93,12 @@ describe "CLI" do
       it "copies file to app folder" do
         ENV[env] = env_file_location
 
-        msg = capture(:stdout) { rake["refinery:override"].invoke }
+        msg = capture { rake["refinery:override"].invoke }
 
         Array(spec_success_message).each do |message_fragment|
-          msg.should include(message_fragment)
+          expect(msg).to include(message_fragment)
         end
-        File.exists?(Rails.root.join(copied_file_location)).should be_true
+        expect(File.exists?(Rails.root.join(copied_file_location))).to be_truthy
       end
     end
   end
@@ -133,4 +168,31 @@ describe "CLI" do
       let(:copied_file_location) { "app/assets/stylesheets/refinery/#{file_name}" }
     end
   end
+
+  private
+
+  # From episode 029 of Ruby Tapas by Avdi
+  # https://rubytapas.dpdcart.com/subscriber/post?id=88
+  def capture(stream=STDOUT, &block)
+    old_stdout = stream.clone
+    pipe_r, pipe_w = IO.pipe
+    pipe_r.sync    = true
+    output         = ""
+    reader = Thread.new do
+      begin
+        loop do
+          output << pipe_r.readpartial(1024)
+        end
+      rescue EOFError
+      end
+    end
+    stream.reopen(pipe_w)
+    yield
+  ensure
+    stream.reopen(old_stdout)
+    pipe_w.close
+    reader.join
+    pipe_r.close
+    return output
+  end
 end

data/spec/lib/refinery/core/configuration_spec.rb

@@ -11,8 +11,8 @@ module Refinery
 
         context 'when set in configuration' do
           it 'returns name set by Refinery::Core.config' do
-            Refinery::Core.stub(:site_name).and_return('Test Site Name')
-            Refinery::Core.site_name.should eq('Test Site Name')
+            allow(Refinery::Core).to receive(:site_name).and_return('Test Site Name')
+            expect(Refinery::Core.site_name).to eq('Test Site Name')
           end
         end
 
@@ -28,14 +28,14 @@ module Refinery
           end
 
           it 'returns name set in locale' do
-            Refinery::Core.site_name.should eq('I18n Site Name')
+            expect(Refinery::Core.site_name).to eq('I18n Site Name')
           end
         end
       end
 
       describe 'custom storage backend' do
         it 'class should be nil by default' do
-          Refinery::Core.dragonfly_custom_backend_class.should == nil
+          expect(Refinery::Core.dragonfly_custom_backend_class).to eq(nil)
         end
 
         context 'is set in core' do
@@ -45,7 +45,7 @@ module Refinery
 
           it 'and is set to a class that exists' do
             Refinery::Core.dragonfly_custom_backend_class = 'Refinery::Core::DummyBackend'
-            Refinery::Core.dragonfly_custom_backend_class.should == backend.class
+            expect(Refinery::Core.dragonfly_custom_backend_class).to eq(backend.class)
           end
         end
       end

data/spec/lib/refinery/core/nil_user_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper_no_rails'
+require 'refinery/core/nil_user'
+
+module Refinery
+  module Core
+    RSpec.describe NilUser do
+      describe "plugins" do
+        it "has all" do
+          expect(subject.plugins).to eq(Refinery::Plugins.registered)
+        end
+      end
+
+      describe "landing url" do
+        let(:active_plugins) { double("active_plugins") }
+
+        before do
+          allow(subject).to receive(:active_plugins).and_return(active_plugins)
+        end
+
+        it "queries for the first landable url" do
+          expect(active_plugins).to receive(:first_url_in_menu)
+          subject.landing_url
+        end
+      end
+
+
+      describe "roles" do
+        it "responds to #has_role?" do
+          expect(subject).to respond_to(:has_role?)
+        end
+
+        it "should have all roles by default" do
+          expect(subject).to have_role(:zilch)
+          expect(subject).to have_role(:arbitrary)
+        end
+      end
+    end
+  end
+end

data/spec/lib/refinery/core_spec.rb

@@ -14,16 +14,16 @@ describe Refinery do
         target::INCLUSIONS = []
         subject.include_once(target, mod)
         subject.include_once(target, mod)
-        target::INCLUSIONS.should have(1).item
+        expect(target::INCLUSIONS.size).to eq(1)
       end
     end
   end
 
   describe "#extensions" do
     it "should return an array of modules representing registered extensions" do
-      subject.extensions.should be_a(Array)
+      expect(subject.extensions).to be_a(Array)
       subject.extensions.each do |e|
-        e.should be_a(Module)
+        expect(e).to be_a(Module)
       end
     end
   end
@@ -34,15 +34,15 @@ describe Refinery do
     it "should add the extension's module to the array of registered extensions" do
       subject.register_extension(Refinery::Core)
 
-      Refinery.extensions.should include(Refinery::Core)
-      Refinery.extensions.should have(1).item
+      expect(Refinery.extensions).to include(Refinery::Core)
+      expect(Refinery.extensions.size).to eq(1)
     end
 
     it "should not allow same extension to be registered twice" do
       subject.register_extension(Refinery::Core)
       subject.register_extension(Refinery::Core)
 
-      Refinery.extensions.should have(1).item
+      expect(Refinery.extensions.size).to eq(1)
     end
   end
 
@@ -51,7 +51,7 @@ describe Refinery do
       before { subject.register_extension(Refinery::Core) }
 
       it "should return true if the extension is registered" do
-        subject.extension_registered?(Refinery::Core).should == true
+        expect(subject.extension_registered?(Refinery::Core)).to eq(true)
       end
     end
 
@@ -59,7 +59,7 @@ describe Refinery do
       before { subject.extensions.clear }
 
       it "should return false if the extension is not registered" do
-        subject.extension_registered?(Refinery::Core).should == false
+        expect(subject.extension_registered?(Refinery::Core)).to eq(false)
       end
     end
   end
@@ -73,43 +73,43 @@ describe Refinery do
     it "should remove the extension's module from the array of registered extensions" do
       subject.unregister_extension(Refinery::Images)
 
-      subject.extensions.should have(0).item
+      expect(subject.extensions.size).to eq(0)
     end
   end
 
   describe "#validate_extension!" do
     context "with a valid extension" do
       it "should return nil" do
-        subject.send(:validate_extension!, Refinery::ValidEngine).should be_nil
+        expect(subject.send(:validate_extension!, Refinery::ValidEngine)).to be_nil
       end
     end
 
     context "with an invalid extension" do
       it "should raise invalid extension exception" do
-        lambda {
+        expect {
           subject.send(:validate_extension!, Refinery::InvalidEngine)
-        }.should raise_error
+        }.to raise_error(::Refinery::InvalidEngineError)
       end
     end
   end
 
   describe "#roots" do
     it "should return pathname to extension root when given constant as parameter" do
-      subject.roots(Refinery::Core).should == Refinery::Core.root
+      expect(subject.roots(Refinery::Core)).to eq(Refinery::Core.root)
     end
 
     it "should return pathname to extension root when given symbol as parameter" do
-      subject.roots(:'refinery/core').should == Refinery::Core.root
+      expect(subject.roots(:'refinery/core')).to eq(Refinery::Core.root)
     end
 
     it "should return pathname to extension root when given string as parameter" do
-      subject.roots("refinery/core").should == Refinery::Core.root
+      expect(subject.roots("refinery/core")).to eq(Refinery::Core.root)
     end
 
     it "should return an array of all pathnames if no extension_name is specified" do
-      subject.roots.should be_a(Array)
+      expect(subject.roots).to be_a(Array)
       subject.roots.each do |root|
-        root.should be_a(Pathname)
+        expect(root).to be_a(Pathname)
       end
     end
   end
@@ -126,19 +126,19 @@ describe Refinery do
     it "shows a deprecation warning" do
       Refinery.deprecate("ugis")
       @errors.rewind
-      @errors.read.should == "\n-- DEPRECATION WARNING --\nThe use of 'ugis' is deprecated.\n"
+      expect(@errors.read).to eq("\n-- DEPRECATION WARNING --\nThe use of 'ugis' is deprecated.\n")
     end
 
     it "takes when option" do
       Refinery.deprecate("ugis", :when => "10.0")
       @errors.rewind
-      @errors.read.should == "\n-- DEPRECATION WARNING --\nThe use of 'ugis' is deprecated and will be removed at version 10.0.\n"
+      expect(@errors.read).to eq("\n-- DEPRECATION WARNING --\nThe use of 'ugis' is deprecated and will be removed at version 10.0.\n")
     end
 
     it "takes replacement option" do
       Refinery.deprecate("ugis", :when => "10.0", :replacement => "philip")
       @errors.rewind
-      @errors.read.should == "\n-- DEPRECATION WARNING --\nThe use of 'ugis' is deprecated and will be removed at version 10.0.\nPlease use philip instead.\n"
+      expect(@errors.read).to eq("\n-- DEPRECATION WARNING --\nThe use of 'ugis' is deprecated and will be removed at version 10.0.\nPlease use philip instead.\n")
     end
   end
 
@@ -148,12 +148,12 @@ describe Refinery do
       end
 
       it "returns admin_dummy_path" do
-        Refinery.route_for_model(Refinery::Dummy).should == "admin_dummy_path"
+        expect(Refinery.route_for_model(Refinery::Dummy)).to eq("admin_dummy_path")
       end
 
       context ":plural => true" do
         it "returns admin_dummies_path" do
-          Refinery.route_for_model(Refinery::Dummy, :plural => true).should == "admin_dummies_path"
+          expect(Refinery.route_for_model(Refinery::Dummy, :plural => true)).to eq("admin_dummies_path")
         end
       end
     end
@@ -163,7 +163,7 @@ describe Refinery do
       end
 
       it "returns admin_group_class_path" do
-        Refinery.route_for_model(Refinery::GroupClass).should == "admin_group_class_path"
+        expect(Refinery.route_for_model(Refinery::GroupClass)).to eq("admin_group_class_path")
       end
     end
 
@@ -172,12 +172,12 @@ describe Refinery do
       end
 
       it "returns admin_dummy_name_path" do
-        Refinery.route_for_model(Refinery::DummyName).should == "admin_dummy_name_path"
+        expect(Refinery.route_for_model(Refinery::DummyName)).to eq("admin_dummy_name_path")
       end
 
       context ":plural => true" do
         it "returns admin_dummy_names_path" do
-          Refinery.route_for_model(Refinery::DummyName, :plural => true).should == "admin_dummy_names_path"
+          expect(Refinery.route_for_model(Refinery::DummyName, :plural => true)).to eq("admin_dummy_names_path")
         end
       end
     end
@@ -189,24 +189,24 @@ describe Refinery do
       end
 
       it "returns dummy_admin_name_path" do
-        Refinery.route_for_model(Refinery::Dummy::Name).should == "dummy_admin_name_path"
+        expect(Refinery.route_for_model(Refinery::Dummy::Name)).to eq("dummy_admin_name_path")
       end
 
       context ":plural => true" do
         it "returns dummy_admin_names_path" do
-          Refinery.route_for_model(Refinery::Dummy::Name, :plural => true).should == "dummy_admin_names_path"
+          expect(Refinery.route_for_model(Refinery::Dummy::Name, :plural => true)).to eq("dummy_admin_names_path")
         end
       end
 
       context ":admin => false" do
         it "returns dummy_name_path" do
-          Refinery.route_for_model(Refinery::Dummy::Name, :admin => false).should == 'dummy_name_path'
+          expect(Refinery.route_for_model(Refinery::Dummy::Name, :admin => false)).to eq('dummy_name_path')
         end
       end
 
       context ":admin => false, :plural => true" do
         it "returns dummy_names_path" do
-          Refinery.route_for_model(Refinery::Dummy::Name, :admin => false, :plural => true).should == 'dummy_names_path'
+          expect(Refinery.route_for_model(Refinery::Dummy::Name, :admin => false, :plural => true)).to eq('dummy_names_path')
         end
       end
     end
@@ -215,8 +215,17 @@ describe Refinery do
   describe Refinery::Core::Engine do
     describe "#helpers" do
       it "should not include ApplicationHelper" do
-        Refinery::Core::Engine.helpers.ancestors.map(&:name).should_not include("ApplicationHelper")
+        expect(Refinery::Core::Engine.helpers.ancestors.map(&:name)).not_to include("ApplicationHelper")
       end
     end
   end
+
+  describe "backend_path" do
+    let(:root_path) { "/custom/path" }
+
+    it "should take into account the mount point" do
+      allow(Refinery::Core).to receive(:mounted_path).and_return(root_path)
+      expect(Refinery::Core.backend_path).to eq("#{root_path}/refinery")
+    end
+  end
 end

data/spec/lib/refinery/crud_spec.rb

@@ -11,7 +11,6 @@ end
 
 module Refinery
   class CrudDummy < ActiveRecord::Base
-    attr_accessible :parent_id
     acts_as_nested_set
   end
 
@@ -22,79 +21,92 @@ end
 
 module Refinery
   describe CrudDummyController, :type => :controller do
+    before do
+      @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
+        r.draw do
+          namespace :refinery do
+            resources :crud_dummy, except: :show do
+              post :update_positions, on: :collection
+            end
+          end
+        end
+      end
+    end
 
     describe "#update_positions" do
-      let!(:crud_dummy_one) { Refinery::CrudDummy.create! }
-      let!(:crud_dummy_two) { Refinery::CrudDummy.create! }
-      let!(:crud_dummy_three) { Refinery::CrudDummy.create! }
-
-      it "orders dummies" do
-        post :update_positions, {
-          "ul" => {
-            "0" => {
-              "0" => {"id" => "crud_dummy_#{crud_dummy_three.id}"},
-              "1" => {"id" => "crud_dummy_#{crud_dummy_two.id}"},
-              "2" => {"id" => "crud_dummy_#{crud_dummy_one.id}"}
+      context "with existing dummies" do
+        let!(:crud_dummy_one) { Refinery::CrudDummy.create! }
+        let!(:crud_dummy_two) { Refinery::CrudDummy.create! }
+        let!(:crud_dummy_three) { Refinery::CrudDummy.create! }
+
+        it "orders dummies" do
+          post :update_positions, {
+            "ul" => {
+              "0" => {
+                "0" => {"id" => "crud_dummy_#{crud_dummy_three.id}"},
+                "1" => {"id" => "crud_dummy_#{crud_dummy_two.id}"},
+                "2" => {"id" => "crud_dummy_#{crud_dummy_one.id}"}
+              }
             }
           }
-        }
 
-        dummy = crud_dummy_three.reload
-        dummy.lft.should eq(1)
-        dummy.rgt.should eq(2)
+          dummy = crud_dummy_three.reload
+          expect(dummy.lft).to eq(1)
+          expect(dummy.rgt).to eq(2)
 
-        dummy = crud_dummy_two.reload
-        dummy.lft.should eq(3)
-        dummy.rgt.should eq(4)
+          dummy = crud_dummy_two.reload
+          expect(dummy.lft).to eq(3)
+          expect(dummy.rgt).to eq(4)
 
-        dummy = crud_dummy_one.reload
-        dummy.lft.should eq(5)
-        dummy.rgt.should eq(6)
-      end
+          dummy = crud_dummy_one.reload
+          expect(dummy.lft).to eq(5)
+          expect(dummy.rgt).to eq(6)
+        end
 
-      it "orders nested dummies" do
-        nested_crud_dummy_one = Refinery::CrudDummy.create! :parent_id => crud_dummy_one.id
-        nested_crud_dummy_two = Refinery::CrudDummy.create! :parent_id => crud_dummy_one.id
+        it "orders nested dummies" do
+          nested_crud_dummy_one = Refinery::CrudDummy.create! :parent_id => crud_dummy_one.id
+          nested_crud_dummy_two = Refinery::CrudDummy.create! :parent_id => crud_dummy_one.id
 
-        post :update_positions, {
-          "ul" => {
-            "0" => {
+          post :update_positions, {
+            "ul" => {
               "0" => {
-                "id" => "crud_dummy_#{crud_dummy_three.id}",
-                "children" => {
-                  "0" => {
-                    "0" => {"id" => "crud_dummy_#{nested_crud_dummy_one.id}"},
-                    "1" => {"id" => "crud_dummy_#{nested_crud_dummy_two.id}"}
+                "0" => {
+                  "id" => "crud_dummy_#{crud_dummy_three.id}",
+                  "children" => {
+                    "0" => {
+                      "0" => {"id" => "crud_dummy_#{nested_crud_dummy_one.id}"},
+                      "1" => {"id" => "crud_dummy_#{nested_crud_dummy_two.id}"}
+                    }
                   }
-                }
-              },
-              "1" => {"id" => "crud_dummy_#{crud_dummy_two.id}"},
-              "2" => {"id" => "crud_dummy_#{crud_dummy_one.id}"}
+                },
+                "1" => {"id" => "crud_dummy_#{crud_dummy_two.id}"},
+                "2" => {"id" => "crud_dummy_#{crud_dummy_one.id}"}
+              }
             }
           }
-        }
 
-        dummy = crud_dummy_three.reload
-        dummy.lft.should eq(1)
-        dummy.rgt.should eq(6)
+          dummy = crud_dummy_three.reload
+          expect(dummy.lft).to eq(1)
+          expect(dummy.rgt).to eq(6)
 
-        dummy = nested_crud_dummy_one.reload
-        dummy.lft.should eq(2)
-        dummy.rgt.should eq(3)
-        dummy.parent_id.should eq(crud_dummy_three.id)
+          dummy = nested_crud_dummy_one.reload
+          expect(dummy.lft).to eq(2)
+          expect(dummy.rgt).to eq(3)
+          expect(dummy.parent_id).to eq(crud_dummy_three.id)
 
-        dummy = nested_crud_dummy_two.reload
-        dummy.lft.should eq(4)
-        dummy.rgt.should eq(5)
-        dummy.parent_id.should eq(crud_dummy_three.id)
+          dummy = nested_crud_dummy_two.reload
+          expect(dummy.lft).to eq(4)
+          expect(dummy.rgt).to eq(5)
+          expect(dummy.parent_id).to eq(crud_dummy_three.id)
 
-        dummy = crud_dummy_two.reload
-        dummy.lft.should eq(7)
-        dummy.rgt.should eq(8)
+          dummy = crud_dummy_two.reload
+          expect(dummy.lft).to eq(7)
+          expect(dummy.rgt).to eq(8)
 
-        dummy = crud_dummy_one.reload
-        dummy.lft.should eq(9)
-        dummy.rgt.should eq(10)
+          dummy = crud_dummy_one.reload
+          expect(dummy.lft).to eq(9)
+          expect(dummy.rgt).to eq(10)
+        end
       end
 
       # Regression test for https://github.com/refinery/refinerycms/issues/1585
@@ -105,13 +117,12 @@ module Refinery
         # sorted above #2 if we are sorting by strings.
         11.times do |n|
           dummy << Refinery::CrudDummy.create!
-          dummy_params["#{n}"] = {"id" => "crud_dummy_#{dummy[n].id}"}
+          dummy_params[n.to_s] = {"id" => "crud_dummy_#{dummy[n].id}"}
         end
 
         post :update_positions, { "ul" => { "0" => dummy_params } }
 
-        dummy = dummy.last.reload
-        dummy.lft.should eq(21)
+        expect(dummy.last.reload.lft).to eq(21)
       end
     end