clearance 1.4.3 → 1.5.0

data/spec/routing/clearance_routes_spec.rb

@@ -1,16 +1,41 @@
 require 'spec_helper'
 
 describe 'routes for Clearance' do
-  context 'signup disabled' do
-    before(:all) do
-      Clearance.configure do |config|
-        config.allow_sign_up = false
-      end
+  context 'routes enabled' do
+    it 'draws the default routes' do
+      expect(get: 'sign_up').to be_routable
+      expect(get: 'sign_in').to be_routable
+      expect(get: 'passwords/new').to be_routable
+      expect(post: 'session').to be_routable
+      expect(post: 'passwords').to be_routable
+      expect(post: 'users').to be_routable
+    end
+  end
 
+  context 'routes disabled' do
+    around do |example|
+      Clearance.configure { |config| config.routes = false }
+      Rails.application.reload_routes!
+      example.run
+      Clearance.configuration = Clearance::Configuration.new
       Rails.application.reload_routes!
     end
 
-    after :all do
+    it 'does not draw any routes' do
+      expect(get: 'sign_up').not_to be_routable
+      expect(get: 'sign_in').not_to be_routable
+      expect(get: 'passwords/new').not_to be_routable
+      expect(post: 'session').not_to be_routable
+      expect(post: 'passwords').not_to be_routable
+      expect(post: 'users').not_to be_routable
+    end
+  end
+
+  context 'signup disabled' do
+    around do |example|
+      Clearance.configure { |config| config.allow_sign_up = false }
+      Rails.application.reload_routes!
+      example.run
       Clearance.configuration = Clearance::Configuration.new
       Rails.application.reload_routes!
     end

data/spec/spec_helper.rb

@@ -24,6 +24,7 @@ RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
   config.mock_with :mocha
   config.use_transactional_fixtures = true
+  config.infer_spec_type_from_file_location!
 end
 
 def restore_default_config

data/spec/support/cookies.rb

@@ -19,16 +19,16 @@ RSpec::Matchers.define :set_cookie do |name, expected_value, expected_expires_at
   end
 
   def ensure_cookie_set
-    @value.should == @expected_value
+    expect(@value).to eq @expected_value
   end
 
   def ensure_expiration_correct
-    @expires_at.should_not be_nil
-    @expires_at.should be_within(100).of(@expected_expires_at)
+    expect(@expires_at).not_to be_nil
+    expect(@expires_at).to be_within(100).of(@expected_expires_at)
   end
 
   def ensure_path_is_correct
-    @path.should == "/"
+    expect(@path).to eq '/'
   end
 
   def expectation

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Dan Croak
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -110,6 +110,7 @@ files:
 - db/migrate/20110111224543_create_clearance_users.rb
 - db/schema.rb
 - features/add_migrations_to_project.feature
+- features/copy_routes_to_host_application.feature
 - features/integration_with_rspec.feature
 - features/integration_with_test_unit.feature
 - features/step_definitions/configuration_steps.rb
@@ -155,6 +156,8 @@ files:
 - lib/generators/clearance/install/templates/db/migrate/add_clearance_to_users.rb
 - lib/generators/clearance/install/templates/db/migrate/create_users.rb
 - lib/generators/clearance/install/templates/user.rb
+- lib/generators/clearance/routes/routes_generator.rb
+- lib/generators/clearance/routes/templates/routes.rb
 - lib/generators/clearance/specs/USAGE
 - lib/generators/clearance/specs/specs_generator.rb
 - lib/generators/clearance/specs/templates/factories/clearance.rb
@@ -181,7 +184,6 @@ files:
 - spec/clearance/token_spec.rb
 - spec/configuration_spec.rb
 - spec/controllers/apis_controller_spec.rb
-- spec/controllers/flashes_controller_spec.rb
 - spec/controllers/forgeries_controller_spec.rb
 - spec/controllers/passwords_controller_spec.rb
 - spec/controllers/permissions_controller_spec.rb
@@ -228,6 +230,7 @@ specification_version: 4
 summary: Rails authentication & authorization with email & password.
 test_files:
 - features/add_migrations_to_project.feature
+- features/copy_routes_to_host_application.feature
 - features/integration_with_rspec.feature
 - features/integration_with_test_unit.feature
 - features/step_definitions/configuration_steps.rb
@@ -245,7 +248,6 @@ test_files:
 - spec/clearance/token_spec.rb
 - spec/configuration_spec.rb
 - spec/controllers/apis_controller_spec.rb
-- spec/controllers/flashes_controller_spec.rb
 - spec/controllers/forgeries_controller_spec.rb
 - spec/controllers/passwords_controller_spec.rb
 - spec/controllers/permissions_controller_spec.rb

data/spec/controllers/flashes_controller_spec.rb

@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-class FlashesController < ActionController::Base
-  include Clearance::Controller
-
-  def set_flash
-    flash[:notice] = params[:message]
-    redirect_to view_flash_url
-  end
-
-  def view_flash
-    render text: "<html><body>#{flash[:notice]}</body></html>"
-  end
-end
-
-describe FlashesController do
-  before do
-    Rails.application.routes.draw do
-      get '/set_flash' => 'flashes#set_flash'
-      get '/view_flash' => 'flashes#view_flash'
-    end
-  end
-
-  after do
-    Rails.application.reload_routes!
-  end
-
-  it 'sets and views a flash' do
-    visit '/set_flash?message=hello'
-    page.should have_content('hello')
-  end
-end