refinerycms-core 2.1.5 → 3.0.0

data/spec/helpers/refinery/html_truncation_helper_spec.rb

@@ -1,23 +1,28 @@
 require "spec_helper"
 
 module Refinery
-  describe HtmlTruncationHelper do
+  describe HtmlTruncationHelper, :type => :helper do
 
     describe "#truncate" do
       it "returns nil if text is not present" do
-        helper.truncate("").should be_nil
+        expect(helper.truncate("")).to be_nil
       end
 
       context "when preserve_html_tags option is present" do
         it "preserve html tags when truncating text" do
-          helper.truncate("<p>Turducken frankfurter ham hock bacon</p>",
-                          :preserve_html_tags => true).should eq("<p>Turducken frankfurter ham...</p>")
+          expect(
+            helper.truncate(
+              "<p>Turducken frankfurter ham hock bacon</p>",
+              preserve_html_tags: true
+            )
+          ).to eq("<p>Turducken frankfurter ham...</p>")
         end
       end
 
       context "when preserve_html_tags option is not present" do
         it "falls back to original truncate method" do
-          helper.truncate("<p>Turducken frankfurter ham hock bacon</p>").should eq("<p>Turducken frankfurter ha...")
+          expect(TruncateHtml::HtmlTruncator).not_to receive(:new)
+          helper.truncate("<p>Turducken frankfurter ham hock bacon</p>").html_safe
         end
       end
     end

data/spec/helpers/refinery/meta_helper_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 module Refinery
-  describe MetaHelper do
+  describe MetaHelper, :type => :helper do
 
     describe '#canonical_id' do
       context "when page doesn't exist" do
         let(:page) { nil }
 
         it 'returns nothing' do
-          helper.canonical_id(page).should be_nil
+          expect(helper.canonical_id(page)).to be_nil
         end
       end
 
@@ -16,7 +16,7 @@ module Refinery
         let(:page) { Page.new :slug => 'testing' }
 
         it "returns the page's canonical slug with '-page' appended" do
-          helper.canonical_id(page).should == page.canonical_slug << '-page'
+          expect(helper.canonical_id(page)).to eq(page.canonical_slug << '-page')
         end
       end
     end

data/spec/helpers/refinery/pagination_helper_spec.rb

@@ -1,32 +1,32 @@
 require "spec_helper"
 
 module Refinery
-  describe PaginationHelper do
+  describe PaginationHelper, :type => :helper do
 
     describe "#pagination_css_class" do
       context "when request.xhr? and params[:from_page] is set" do
         before do
-          controller.request.stub(:xhr?).and_return(true)
+          allow(controller.request).to receive(:xhr?).and_return(true)
         end
 
         context "when params[:from_page] > params[:page] or 1" do
           it "does something" do
-            helper.stub(:params).and_return({:from_page => 2, :page => 1})
-            helper.pagination_css_class.should == "frame_left"
+            allow(helper).to receive(:params).and_return({:from_page => 2, :page => 1})
+            expect(helper.pagination_css_class).to eq("frame_left")
           end
         end
 
         context "when params[:from_page] < params[:page] or 1" do
           it "returns frame_right" do
-            helper.stub(:params).and_return({:from_page => 1, :page => 1})
-            helper.pagination_css_class.should == "frame_right"
+            allow(helper).to receive(:params).and_return({:from_page => 1, :page => 1})
+            expect(helper.pagination_css_class).to eq("frame_right")
           end
         end
       end
 
       context "when request.xhr? and params[:from_page] isn't set" do
         it "returns frame_center" do
-          helper.pagination_css_class.should == "frame_center"
+          expect(helper.pagination_css_class).to eq("frame_center")
         end
       end
     end

data/spec/helpers/refinery/tag_helper_spec.rb

@@ -1,21 +1,21 @@
 require "spec_helper"
 
 module Refinery
-  describe TagHelper do
+  describe TagHelper, :type => :helper do
 
     describe "#refinery_help_tag" do
       it "makes title html_safe if it's not already" do
-        helper.refinery_help_tag("<br /> ugisozols").should =~ /&lt;br \/&gt; ugisozols/
+        expect(helper.refinery_help_tag("<br /> ugisozols")).to match(/&lt;br \/&gt; ugisozols/)
       end
     end
 
     describe "#refinery_icon_tag" do
       it "appends .png to filename if specified string has no dots in it" do
-        helper.refinery_icon_tag("ugisozols").should =~ /ugisozols\.png/
+        expect(helper.refinery_icon_tag("ugisozols")).to match(/ugisozols\.png/)
       end
 
       it "wraps image_tag with some options preset" do
-        helper.refinery_icon_tag("ugis.ozols.jpg").should eq("<img alt=\"Ugis.ozols\" height=\"16\" src=\"/assets/refinery/icons/ugis.ozols.jpg\" width=\"16\" />")
+        expect(helper.refinery_icon_tag("ugis.ozols.jpg")).to xml_eq(%Q{<img alt="Ugis.ozols" height="16" src="/images/refinery/icons/ugis.ozols.jpg" width="16" />})
       end
     end
 

data/spec/helpers/refinery/translation_helper_spec.rb

@@ -1,12 +1,12 @@
 require "spec_helper"
 
 module Refinery
-  describe TranslationHelper do
+  describe TranslationHelper, :type => :helper do
 
     describe "#t" do
       it "overrides Rails' translation method" do
-        helper.t("ugisozols").should eq("i18n: Ugisozols")
-        helper.t("ugisozols.test").should eq("i18n: Test")
+        expect(helper.t("ugisozols")).to eq("i18n: Ugisozols")
+        expect(helper.t("ugisozols.test")).to eq("i18n: Test")
       end
     end
 

data/spec/lib/generators/refinery/cms/cms_generator_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
-require 'generator_spec/test_case'
+require 'generator_spec/generator_example_group'
 require 'generators/refinery/cms/cms_generator'
 
 module Refinery
   describe CmsGenerator do
-    include GeneratorSpec::TestCase
     destination File.expand_path("../../../../../../tmp", __FILE__)
 
     before do
@@ -12,24 +11,19 @@ module Refinery
 
       dir = "#{destination_root}/config/environments"
       FileUtils.mkdir_p(dir)
-      File.open("#{dir}/development.rb", "w") do |file|
-        file.write <<-SPEC
+      File.write "#{dir}/development.rb", <<-SPEC
 Dummy::Application.configure do
   config.action_mailer.test = true
 end
-        SPEC
-      end
+      SPEC
 
-      File.open("#{dir}/test.rb", "w") do |file|
-        file.write <<-SPEC
+      File.write "#{dir}/test.rb", <<-SPEC
 Dummy::Application.configure do
   # config.action_mailer.test = true
 end
-        SPEC
-      end
+      SPEC
 
-      File.open("#{dir}/production.rb", "w") do |file|
-        file.write <<-SPEC
+      File.write "#{dir}/production.rb", <<-SPEC
 Dummy::Application.configure do
   config.action_mailer.test = true
   config.action_mailer.check = {
@@ -37,24 +31,24 @@ Dummy::Application.configure do
     :check => true
   }
 end
-        SPEC
-      end
+      SPEC
 
+      copy_routes
       run_generator %w[--skip-db --skip-migrations]
     end
 
     specify do
-      destination_root.should have_structure {
+      expect(destination_root).to have_structure {
         directory "app" do
           directory "decorators" do
             directory "controllers" do
               directory "refinery" do
-                file ".gitkeep"
+                file ".keep"
               end
             end
             directory "models" do
               directory "refinery" do
-                file ".gitkeep"
+                file ".keep"
               end
             end
           end
@@ -74,20 +68,17 @@ end
 
     describe "#ensure_environments_are_sane" do
       it "wraps single line config.action_mailer setting" do
-        File.open("#{destination_root}/config/environments/development.rb") do |file|
-          file.read.should eq <<-SPEC
+        expect(File.read("#{destination_root}/config/environments/development.rb")).to eq <<-SPEC
 Dummy::Application.configure do
   if config.respond_to?(:action_mailer)
     config.action_mailer.test = true
   end
 end
-          SPEC
-        end
+        SPEC
       end
 
       it "wraps multi line config.action_mailer settings" do
-        File.open("#{destination_root}/config/environments/production.rb") do |file|
-          file.read.should eq <<-SPEC
+        expect(File.read("#{destination_root}/config/environments/production.rb")).to eq <<-SPEC
 Dummy::Application.configure do
   if config.respond_to?(:action_mailer)
     config.action_mailer.test = true
@@ -97,9 +88,23 @@ Dummy::Application.configure do
     }
   end
 end
-          SPEC
-        end
+        SPEC
+      end
+    end
+
+    describe "#mount!" do
+      it 'adds Refinery to routes.rb' do
+        expect(File.read("#{destination_root}/config/routes.rb")).to match /Refinery/
       end
     end
+
+    def copy_routes
+      routes = File.join(Gem.loaded_specs['railties'].full_gem_path, 'lib', 'rails', 'generators', 'rails', 'app', 'templates', 'config', 'routes.rb')
+      destination = File.join(destination_root, "config")
+
+      FileUtils.mkdir_p(destination)
+      FileUtils.cp routes, destination
+    end
+
   end
 end

data/spec/lib/generators/refinery/core/core_generator_spec.rb

@@ -13,7 +13,7 @@ module Refinery
     end
 
     specify do
-      destination_root.should have_structure {
+      expect(destination_root).to have_structure {
         directory "config" do
           directory "initializers" do
             directory "refinery" do

data/spec/lib/generators/refinery/engine/engine_generator_multiple_resources_spec.rb

@@ -19,7 +19,7 @@ module Refinery
       end
 
       it "uses the extension name for the namespace" do
-        destination_root.should have_structure {
+        expect(destination_root).to have_structure {
           directory "vendor" do
             directory "extensions" do
               directory "rspec_product_tests" do
@@ -46,7 +46,7 @@ module Refinery
       end
 
       it "creates a new migration with the new resource" do
-        destination_root.should have_structure {
+        expect(destination_root).to have_structure {
           directory "vendor" do
             directory "extensions" do
               directory "rspec_product_tests" do
@@ -62,17 +62,16 @@ module Refinery
       end
 
       it "appends existing seeds file" do
-         File.open("#{destination_root}/vendor/extensions/rspec_product_tests/db/seeds.rb") do |file|
-           file.grep(%r{/rspec_product_tests|/rspec_item_tests}).count.should eq(2)
-         end
-       end
+        File.open("#{destination_root}/vendor/extensions/rspec_product_tests/db/seeds.rb") do |file|
+          expect(file.grep(%r{/rspec_product_tests|/rspec_item_tests}).count).to eq(2)
+        end
+      end
 
       it "appends routes to the routes file" do
         File.open("#{destination_root}/vendor/extensions/rspec_product_tests/config/routes.rb") do |file|
-          file.grep(%r{rspec_item_tests}).count.should eq(2)
+          expect(file.grep(%r{rspec_item_tests}).count).to eq(2)
         end
       end
     end
-
   end
 end

data/spec/lib/generators/refinery/engine/engine_generator_sanity_check_spec.rb

@@ -9,39 +9,39 @@ module Refinery
     it "exits when reserved word is used for extension name" do
       clash_keywords = YAML.load_file(File.expand_path("../../../../../../lib/generators/refinery/clash_keywords.yml", __FILE__))
       clash_keywords.each do |word|
-        lambda {
-          STDERR.should_receive(:puts).with("\nPlease choose a different name. The generated code would fail for class '#{word}' as it conflicts with a reserved keyword.\n\n")
+        expect {
+          expect(STDERR).to receive(:puts).with("\nPlease choose a different name. The generated code would fail for class '#{word}' as it conflicts with a reserved keyword.\n\n")
           run_generator [word, "title:string"]
-        }.should raise_error
+        }.to raise_error(SystemExit)
       end
     end
 
     it "exits when plural word is used for extension name" do
-      lambda {
-        STDERR.should_receive(:puts).with("\nPlease specify the singular name 'apple' instead of 'apples'.\n\n")
+      expect {
+        expect(STDERR).to receive(:puts).with("\nPlease specify the singular name 'apple' instead of 'apples'.\n\n")
         run_generator %w{ apples title:string }
-      }.should raise_error
+      }.to raise_error(SystemExit)
     end
 
     it "exits when uncountable word is used for extension name" do
-      lambda {
-        STDERR.should_receive(:puts).with("\nThe extension name you specified will not work as the singular name is equal to the plural name.\n\n")
+      expect {
+        expect(STDERR).to receive(:puts).with("\nThe extension name you specified will not work as the singular name is equal to the plural name.\n\n")
         run_generator %w{ money title:string }
-      }.should raise_error
+      }.to raise_error(SystemExit)
     end
 
     it "exits when no attribute provided" do
-      lambda {
-        STDERR.should_receive(:puts).with("\nYou must specify a name and at least one field.\nFor help, run: rails generate refinery:engine\n\n")
+      expect {
+        expect(STDERR).to receive(:puts).with("\nYou must specify a name and at least one field.\nFor help, run: rails generate refinery:engine\n\n")
         run_generator %w{ car }
-      }.should raise_error
+      }.to raise_error(SystemExit)
     end
 
     it "exits when '--extension' option is used but there is no extension by provided name" do
-      lambda {
-        STDERR.should_receive(:puts).with("\nYou can't use '--extension nonexistent' option because extension with name nonexistent doesn't exist.\n\n")
+      expect {
+        expect(STDERR).to receive(:puts).with("\nYou can't use '--extension nonexistent' because an extension with the name 'nonexistent' doesn't exist.\n\n")
         run_generator %w{ car title:string --extension nonexistent }
-      }.should raise_error
+      }.to raise_error(SystemExit)
     end
   end
 end

data/spec/lib/generators/refinery/engine/engine_generator_spec.rb

@@ -12,8 +12,16 @@ module Refinery
       run_generator %w{ rspec_product_test title:string description:text image:image brochure:resource }
     end
 
+    it "uses reference columns for image and resource attributes" do
+      File.open("#{destination_root}/vendor/extensions/rspec_product_tests/app/controllers/refinery/rspec_product_tests/admin/rspec_product_tests_controller.rb") do |file|
+        content = file.read
+        expect(content.include?('image_id')).to be_truthy
+        expect(content.include?('brochure_id')).to be_truthy
+      end
+    end
+
     specify do
-      destination_root.should have_structure {
+      expect(destination_root).to have_structure {
         directory "vendor" do
           directory "extensions" do
             directory "rspec_product_tests" do
@@ -141,13 +149,5 @@ module Refinery
         end
       }
     end
-
-    describe "attr_accessible" do
-      it "adds attributes to the list" do
-        File.open("#{destination_root}/vendor/extensions/rspec_product_tests/app/models/refinery/rspec_product_tests/rspec_product_test.rb") do |file|
-          file.grep(%r{attr_accessible :title, :description, :image_id, :brochure_id, :position}).count.should eq(1)
-        end
-      end
-    end
   end
 end

data/spec/lib/generators/refinery/engine/engine_generator_with_i18n_spec.rb

@@ -13,7 +13,7 @@ module Refinery
     end
 
     specify do
-      destination_root.should have_structure {
+      expect(destination_root).to have_structure {
         directory "vendor" do
           directory "extensions" do
             directory "rspec_product_tests" do

data/spec/lib/generators/refinery/engine/engine_generator_without_frontend_spec.rb

@@ -13,7 +13,7 @@ module Refinery
     end
 
     specify do
-      destination_root.should have_structure {
+      expect(destination_root).to have_structure {
         directory "vendor" do
           directory "extensions" do
             directory "rspec_product_tests" do

data/spec/lib/refinery/application_controller_spec.rb

@@ -13,7 +13,7 @@ module Refinery
       Rails.application.reload_routes!
     end
 
-    controller do
+    controller(ActionController::Base) do
       include ::Refinery::ApplicationController
 
       def index
@@ -23,46 +23,46 @@ module Refinery
 
     describe ".home_page?" do
       it "matches root url" do
-        controller.stub(:root_path).and_return("/")
-        request.stub(:path).and_return("/")
-        controller.home_page?.should be_true
+        allow(controller).to receive(:root_path).and_return("/")
+        allow(request).to receive(:path).and_return("/")
+        expect(controller.home_page?).to be_truthy
       end
 
       it "matches localised root url" do
-        controller.refinery.stub(:root_path).and_return("/en/")
-        request.stub(:path).and_return("/en")
-        controller.home_page?.should be_true
+        allow(controller.refinery).to receive(:root_path).and_return("/en/")
+        allow(request).to receive(:path).and_return("/en")
+        expect(controller.home_page?).to be_truthy
       end
 
       it "matches localised root url with trailing slash" do
-        controller.refinery.stub(:root_path).and_return("/en/")
-        request.stub(:path).and_return("/en/")
-        controller.home_page?.should be_true
+        allow(controller.refinery).to receive(:root_path).and_return("/en/")
+        allow(request).to receive(:path).and_return("/en/")
+        expect(controller.home_page?).to be_truthy
       end
 
       it "escapes regexp" do
-        request.stub(:path).and_return("\/huh)")
+        allow(request).to receive(:path).and_return("\/huh)")
         expect { controller.home_page? }.to_not raise_error
       end
 
       it "returns false for non root url" do
-        request.stub(:path).and_return("/foo/")
-        controller.should_not be_home_page
+        allow(request).to receive(:path).and_return("/foo/")
+        expect(controller).not_to be_home_page
       end
     end
 
     describe "#presenter_for" do
       it "returns BasePresenter for nil" do
-        controller.send(:presenter_for, nil).should eq(BasePresenter)
+        expect(controller.send(:presenter_for, nil)).to eq(BasePresenter)
       end
 
       it "returns BasePresenter when the instance's class does not have a presenter" do
-        controller.send(:presenter_for, Object.new).should eq(BasePresenter)
+        expect(controller.send(:presenter_for, Object.new)).to eq(BasePresenter)
       end
 
       it "returns the class's presenter when the instance's class has a presenter" do
         model = Refinery::Page.new
-        controller.send(:presenter_for, model).should eq(Refinery::PagePresenter)
+        expect(controller.send(:presenter_for, model)).to eq(Refinery::PagePresenter)
       end
     end
   end