high_voltage 2.1.0 → 2.2.1

data/spec/controllers/subclassed_pages_controller_spec.rb

@@ -6,35 +6,29 @@ describe SubclassedPagesController do
   describe 'on GET to /subclassed_pages/also_exists' do
     before { get :show, :id => 'also_exists' }
 
-    it 'should respond with success and render template' do
-      response.should be_success
-      response.should render_template('also_exists')
+    it 'responds with success and render template' do
+      expect(response).to be_succes
+      expect(response).to render_template('also_exists')
     end
 
-    it 'should use the custom configured layout' do
-      response.should_not render_template('layouts/application')
-      response.should render_template('layouts/alternate')
+    it 'uses the custom configured layout' do
+      expect(response).not_to render_template('layouts/application')
+      expect(response).to render_template('layouts/alternate')
     end
   end
 
-  it 'should raise a routing error for an invalid page' do
-    lambda {
-      get :show,
-      :id => 'invalid'
-    }.should raise_error(ActionController::RoutingError)
+  it 'raises a routing error for an invalid page' do
+    expect { get :show, id: 'invalid' }
+      .to raise_error(ActionController::RoutingError)
   end
 
-  it 'should raise a routing error for a page in another directory' do
-    lambda {
-      get :show,
-      :id => '../other/wrong'
-    }.should raise_error(ActionController::RoutingError)
+  it 'raises a routing error for a page in another directory' do
+    expect { get :show, id: '../other/wrong' }
+      .to raise_error(ActionController::RoutingError)
   end
 
-  it 'should raise missing template error for valid page with invalid partial' do
-    lambda {
-      get :show,
-      :id => 'also_exists_but_references_nonexistent_partial'
-    }.should raise_error(ActionView::MissingTemplate)
+  it 'raises a missing template error for valid page with invalid partial' do
+    expect { get :show, id: 'also_exists_but_references_nonexistent_partial' }
+      .to raise_error(ActionView::MissingTemplate)
   end
 end

data/spec/dummy/config/environments/test.rb

@@ -11,7 +11,8 @@ Dummy::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  config.action_controller.perform_caching = true
+  config.action_controller.cache_store = :memory_store
 
   # Raise exceptions instead of rendering exception templates
   config.action_dispatch.show_exceptions = false

data/spec/high_voltage/configuration_spec.rb

@@ -1,25 +1,88 @@
-require 'spec_helper'
+require 'minimal_spec_helper'
 
 describe HighVoltage::Configuration do
-  let(:config_value) { 'fake_config_value' }
-
-  before(:each) do
-    HighVoltage.configure do |config|
-      config.action_caching = config_value
-      config.action_caching_layout = config_value
-      config.content_path = config_value
-      config.layout = config_value
-      config.page_caching = config_value
-      config.route_drawer = config_value
-      config.routes = config_value
+  describe 'basic config assignment' do
+    let(:config_value) { 'fake_config_value' }
+
+    before(:each) do
+      HighVoltage.configure do |config|
+        ActiveSupport::Deprecation.silence do
+          config.action_caching = config_value
+          config.action_caching_layout = config_value
+          config.content_path = config_value
+          config.layout = config_value
+          config.page_caching = config_value
+          config.parent_engine = config_value
+          config.route_drawer = config_value
+          config.routes = config_value
+        end
+      end
+    end
+
+    after(:each) do
+      HighVoltage.configure do |config|
+        config.parent_engine = Rails.application
+      end
+    end
+
+    it { expect(HighVoltage.action_caching).to eq config_value }
+    it { expect(HighVoltage.action_caching_layout).to eq config_value }
+    it { expect(HighVoltage.content_path).to eq config_value }
+    it { expect(HighVoltage.layout).to eq config_value }
+    it { expect(HighVoltage.page_caching).to eq config_value }
+    it { expect(HighVoltage.parent_engine).to eq config_value }
+    it { expect(HighVoltage.route_drawer).to eq config_value }
+    it { expect(HighVoltage.routes).to eq config_value }
+  end
+
+  describe '#action_caching=' do
+    it 'displays a deprecation warning' do
+      allow(ActiveSupport::Deprecation).to receive(:warn)
+
+      HighVoltage.configure do |config|
+        config.action_caching = true
+      end
+
+      expect(ActiveSupport::Deprecation).to have_received(:warn)
+        .with(HighVoltage::Configuration::CACHING_DEPRECATION_WARNING)
     end
   end
 
-  it { expect(HighVoltage.action_caching).to eq config_value }
-  it { expect(HighVoltage.action_caching_layout).to eq config_value }
-  it { expect(HighVoltage.content_path).to eq config_value }
-  it { expect(HighVoltage.layout).to eq config_value }
-  it { expect(HighVoltage.page_caching).to eq config_value }
-  it { expect(HighVoltage.route_drawer).to eq config_value }
-  it { expect(HighVoltage.routes).to eq config_value }
+  describe '#action_caching_layout=' do
+    it 'displays a deprecation warning' do
+      allow(ActiveSupport::Deprecation).to receive(:warn)
+
+      HighVoltage.configure do |config|
+        config.action_caching_layout = true
+      end
+
+      expect(ActiveSupport::Deprecation).to have_received(:warn)
+        .with(HighVoltage::Configuration::CACHING_DEPRECATION_WARNING)
+    end
+  end
+
+  describe '#page_caching=' do
+    it 'displays a deprecation warning' do
+      allow(ActiveSupport::Deprecation).to receive(:warn)
+
+      HighVoltage.configure do |config|
+        config.page_caching = true
+      end
+
+      expect(ActiveSupport::Deprecation).to have_received(:warn)
+        .with(HighVoltage::Configuration::CACHING_DEPRECATION_WARNING)
+    end
+  end
+
+  describe '#set_default_configuration' do
+    it 'defaults caching without a deprecation warning' do
+      allow(ActiveSupport::Deprecation).to receive(:warn)
+
+      Class.new do
+        extend HighVoltage::Configuration
+      end
+
+      expect(ActiveSupport::Deprecation).not_to have_received(:warn)
+    end
+  end
 end

data/spec/high_voltage/page_finder_spec.rb

@@ -2,22 +2,22 @@ require 'spec_helper'
 
 describe HighVoltage::PageFinder do
   it 'produces the name of an existing template' do
-    find('existing').should eq 'pages/existing'
+    expect(find('existing')).to eq 'pages/existing'
   end
 
   it 'produces the name of a nested template' do
-    find('dir/nested').should eq 'pages/dir/nested'
+    expect(find('dir/nested')).to eq 'pages/dir/nested'
   end
 
   it 'uses a custom content path' do
     with_content_path('other_pages/') do
-      find('also_exists').should eq 'other_pages/also_exists'
+      expect(find('also_exists')).to eq 'other_pages/also_exists'
     end
   end
 
   it 'exposes the content path' do
     with_content_path('another_thing/') do
-      page_finder.content_path.should eq 'another_thing/'
+      expect(page_finder.content_path).to eq 'another_thing/'
     end
   end
 
@@ -28,7 +28,7 @@ describe HighVoltage::PageFinder do
       end
     end
 
-    subclass.new('sweet page').page_name.should eq 'the page is sweet page'
+    expect(subclass.new('sweet page').page_name).to eq 'the page is sweet page'
   end
 
   private

data/spec/high_voltage_spec.rb

@@ -1,11 +1,11 @@
 require 'minimal_spec_helper'
 
 describe HighVoltage do
-  it 'should be valid' do
-    HighVoltage.should be_a(Module)
+  it 'is valid' do
+    expect(HighVoltage).to be_a(Module)
   end
 
-  it 'should be loadable without preloading rails' do
+  it 'is loadable without preloading rails' do
     expect { require 'high_voltage' }.not_to raise_error
   end
 end

data/spec/integration/navigation_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe 'Navigation' do
-  include Capybara::DSL
-
-  it 'should be a valid app' do
-    ::Rails.application.should be_a(Dummy::Application)
+  it 'is a valid app' do
+    expect(::Rails.application).to be_a(Dummy::Application)
   end
 end

data/spec/requests/home_page_spec.rb

@@ -8,6 +8,6 @@ describe 'Home page route' do
 
   it 'redirects the duplicate content to root' do
     get '/home'
-    expect(response).to redirect_to('/')
+    expect(response.headers['Location']).to eq 'http://www.example.com/'
   end
 end

data/spec/routing/routes_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe 'routes' do
   context 'default configuration' do
     it 'generates a route' do
-      page_path('one').should eq '/pages/one'
+      expect(page_path('one')).to eq '/pages/one'
     end
 
     it 'generates a nested route' do
-      page_path('one/two').should eq '/pages/one/two'
+      expect(page_path('one/two')).to eq '/pages/one/two'
     end
 
     it 'recognizes a route' do
@@ -51,11 +51,11 @@ describe 'routes' do
     end
 
     it 'generates a route' do
-      page_path('one').should eq '/one'
+      expect(page_path('one')).to eq '/one'
     end
 
     it 'generates  a nested route' do
-      page_path('one/two').should eq '/one/two'
+      expect(page_path('one/two')).to eq '/one/two'
     end
   end
 
@@ -66,11 +66,11 @@ describe 'routes' do
     end
 
     it 'generates a route' do
-      page_path('one').should eq '/other_pages/one'
+      expect(page_path('one')).to eq '/other_pages/one'
     end
 
     it 'generates a nested route' do
-      page_path('one/two').should eq '/other_pages/one/two'
+      expect(page_path('one/two')).to eq '/other_pages/one/two'
     end
 
     it 'recognizes a route' do
@@ -125,7 +125,7 @@ describe 'routes' do
 
   context 'no home page route' do
     it 'does generate a home page route' do
-      { :get => '/' }.should_not be_routable
+      expect(get: '/').not_to be_routable
     end
   end
 
@@ -134,7 +134,7 @@ describe 'routes' do
       HighVoltage.routes = false
       Rails.application.reload_routes!
 
-      { :get => '/pages/one/two' }.should_not be_routable
+      expect(get: '/pages/one/two').not_to be_routable
     end
   end
 end

data/spec/spec_helper.rb

@@ -2,15 +2,12 @@ ENV['RAILS_ENV'] = 'test'
 
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 
-require 'capybara/rails'
 require 'pry'
 require 'rails/test_help'
 require 'rspec/expectations'
 require 'rspec/rails'
 
 Rails.backtrace_cleaner.remove_silencers!
-Capybara.default_driver = :rack_test
-Capybara.default_selector = :css
 
 Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |file| require file }
 
@@ -20,6 +17,10 @@ RSpec.configure do |config|
     Rails.application.reload_routes!
   end
 
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+
   config.include RSpec::Matchers
   config.mock_with :rspec
   config.order = 'random'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: high_voltage
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Matt Jankowski
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,34 +32,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +80,14 @@ files:
 - app/controllers/concerns/high_voltage/static_page.rb
 - app/controllers/high_voltage/pages_controller.rb
 - config/routes.rb
+- gemfiles/rails3.1.gemfile
+- gemfiles/rails3.1.gemfile.lock
+- gemfiles/rails3.2.gemfile
+- gemfiles/rails3.2.gemfile.lock
+- gemfiles/rails4.0.gemfile
+- gemfiles/rails4.0.gemfile.lock
+- gemfiles/rails4.1.gemfile
+- gemfiles/rails4.1.gemfile.lock
 - high_voltage.gemspec
 - lib/high_voltage.rb
 - lib/high_voltage/configuration.rb
@@ -177,8 +157,6 @@ files:
 - spec/requests/home_page_spec.rb
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb
-- spec/support/caching.rb
-- spec/support/concern_reload.rb
 homepage: http://github.com/thoughtbot/high_voltage
 licenses:
 - MIT
@@ -199,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple static page rendering controller
@@ -264,5 +242,3 @@ test_files:
 - spec/requests/home_page_spec.rb
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb
-- spec/support/caching.rb
-- spec/support/concern_reload.rb

data/spec/support/caching.rb

@@ -1,15 +0,0 @@
-RSpec.configure do |config|
-  config.around(:each, enable_caching: true) do |example|
-    previous_cache_store = ActionController::Base.cache_store
-
-    ActionController::Base.perform_caching = true
-    ActionController::Base.cache_store = :memory_store
-    ActionController::Base.cache_store.clear
-
-    example.run
-
-    ActionController::Base.cache_store.clear
-    ActionController::Base.cache_store = previous_cache_store
-    ActionController::Base.perform_caching = false
-  end
-end

data/spec/support/concern_reload.rb

@@ -1,11 +0,0 @@
-def concern_reload
-  HighVoltage::PagesController.class_eval do
-    if respond_to?(:caches_action)
-      caches_action :show, if: -> { HighVoltage.action_caching }
-    end
-
-    if respond_to?(:caches_page)
-      caches_page :show, if: -> { HighVoltage.page_caching }
-    end
-  end
-end