contour 0.8.3 → 0.8.4

data/test/{fixtures → dummy/test/fixtures}/users.yml

@@ -3,10 +3,10 @@
 valid:
   first_name: FirstName
   last_name: LastName
+  status: active
   deleted: false
-  email: test@example.com
+  email: valid@example.com
   encrypted_password: MyString
-  # password_salt: MyString
   reset_password_token: ResetTokenOne
   remember_token: MyString
   remember_created_at: MyDate
@@ -26,10 +26,10 @@ valid:
 invalid:
   first_name: MyString
   last_name: MyString
+  status: inactive
   deleted: false
   email: EmailTwo
   encrypted_password: MyString
-  # password_salt: MyString
   reset_password_token: ResetTokenTwo
   remember_token: MyString
   remember_created_at: MyDate
@@ -49,10 +49,10 @@ invalid:
 deleted:
   first_name: Deleted
   last_name: User
+  status: active
   deleted: true
   email: deleted@example.com
   encrypted_password: MyString
-  # password_salt: MyString
   reset_password_token: ResetTokenFive
   remember_token: MyString
   remember_created_at: 2011-02-23
@@ -67,4 +67,27 @@ deleted:
   # failed_attempts: 0
   # unlock_token: UnlockTokenFive
   # locked_at: 2011-02-23
+  # authentication_token: MyString
+
+pending:
+  first_name: MyString
+  last_name: MyString
+  status: pending
+  deleted: false
+  email: pending@example.com
+  encrypted_password: MyString
+  reset_password_token: ResetTokenFour
+  remember_token: MyString
+  remember_created_at: 2011-02-23
+  sign_in_count: 0
+  current_sign_in_at: 2011-02-23
+  last_sign_in_at: 2011-02-23
+  current_sign_in_ip: MyString
+  last_sign_in_ip: MyString
+  # confirmation_token: ConfirmationTokenFour
+  # confirmed_at: 2011-02-23
+  # confirmation_sent_at: 2011-02-23
+  # failed_attempts: 0
+  # unlock_token: UnlockTokenFour
+  # locked_at: 2011-02-23
   # authentication_token: MyString

data/test/functional/authentications_controller_test.rb

@@ -1,5 +1,7 @@
 require 'test_helper'
 
+SimpleCov.command_name "test:functionals"
+
 class Contour::AuthenticationsControllerTest < ActionController::TestCase
   setup do
     login(users(:valid))

data/test/integration/navigation_test.rb

@@ -1,8 +1,46 @@
 require 'test_helper'
 
+SimpleCov.command_name "test:integration"
+
 class NavigationTest < ActionDispatch::IntegrationTest
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
+  fixtures :users
+
+  def setup
+    @valid = users(:valid)
+    @pending = users(:pending)
+    @deleted = users(:deleted)
+  end
+
+  test "pending users should be not be allowed to login" do
+    get "/logged_in_page"
+    assert_redirected_to new_user_session_path
+
+    sign_in_as(@pending, "123456", "pending-2@example.com")
+    assert_equal new_user_session_path, path
+    assert_equal I18n.t('devise.failure.inactive'), flash[:alert]
+  end
+
+  test "deleted users should be not be allowed to login" do
+    get "/logged_in_page"
+    assert_redirected_to new_user_session_path
+
+    sign_in_as(@deleted, "123456", "deleted-2@example.com")
+    assert_equal new_user_session_path, path
+    assert_equal I18n.t('devise.failure.inactive'), flash[:alert]
+  end
+
+  test "root navigation redirected to login page" do
+    get "/"
+    assert_redirected_to new_user_session_path
+    assert_equal I18n.t('devise.failure.unauthenticated'), flash[:alert]
+  end
+
+  test "friendly url forwarding after login" do
+    get "/logged_in_page"
+    assert_redirected_to new_user_session_path
+
+    sign_in_as(@valid, "123456", "valid-2@example.com")
+    assert_equal '/logged_in_page', path
+    assert_equal I18n.t('devise.sessions.signed_in'), flash[:notice]
   end
 end

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+require 'simplecov'
+
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
@@ -9,38 +11,37 @@ Rails.backtrace_cleaner.remove_silencers!
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-# class ActiveSupport::TestCase
-#   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-#   #
-#   # Note: You'll currently still have to declare fixtures explicitly in integration tests
-#   # -- they do not yet inherit this setting
-#   fixtures :all
-# 
-#   # Add more helper methods to be used by all tests here...
-# end
-# 
-# class ActionController::TestCase
-#   include Devise::TestHelpers
-#   
-#   def login(user)
-#     @request.env["devise.mapping"] = Devise.mappings[user]
-#     sign_in(:user, user)
-#   end
-# end
-# 
-# class ActionController::IntegrationTest
-#   def sign_in_as(user_template, password, email)
-#     user = User.create(:password => password, :password_confirmation => password, :email => email,
-#                        :first_name => user_template.first_name, :last_name => user_template.last_name)
-#     user.save!
-#     # user.update_attribute :status, user_template.status
-#     user.update_attribute :deleted, user_template.deleted?
-#     # user.update_attribute :system_admin, user_template.system_admin?
-#     post_via_redirect 'users/login', :user => {:email => email, :password => password}
-#     user
-#   end
-# end
-# 
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end
+
+class ActionController::TestCase
+  include Devise::TestHelpers
+  
+  def login(user)
+    @request.env["devise.mapping"] = Devise.mappings[user]
+    sign_in(:user, user)
+  end
+end
+
+class ActionController::IntegrationTest
+  def sign_in_as(user_template, password, email)
+    user = User.create( password: password, password_confirmation: password, email: email,
+                        first_name: user_template.first_name, last_name: user_template.last_name )
+    user.save!
+    user.update_attribute :status, user_template.status
+    user.update_attribute :deleted, user_template.deleted?
+    post_via_redirect 'users/login', user: { email: email, password: password }
+    user
+  end
+end
+
 # module Rack
 #   module Test
 #     class UploadedFile
@@ -49,4 +50,4 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 #       end
 #     end
 #   end
-# end
+# _end_

data/test/unit/user_test.rb

@@ -1,12 +1,12 @@
 require 'test_helper'
 
-# SimpleCov.command_name "test:units"
+SimpleCov.command_name "test:units"
 
 class UserTest < ActiveSupport::TestCase
   test "should get reverse name" do
     assert_equal 'LastName, FirstName', users(:valid).reverse_name
   end
-  
+
   test "should apply omniauth" do
     assert_not_nil users(:valid).apply_omniauth({'user_info' => {'email' => 'Email', 'first_name' => 'FirstName', 'last_name' => 'LastName'}})
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-09 00:00:00.000000000 Z
+date: 2012-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70148576857840 !ruby/object:Gem::Requirement
+  requirement: &70150284044040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0.rc2
   type: :runtime
   prerelease: false
-  version_requirements: *70148576857840
+  version_requirements: *70150284044040
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70148576856280 !ruby/object:Gem::Requirement
+  requirement: &70150284043220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.9
   type: :runtime
   prerelease: false
-  version_requirements: *70148576856280
+  version_requirements: *70150284043220
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70148576871480 !ruby/object:Gem::Requirement
+  requirement: &70150284042180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70148576871480
+  version_requirements: *70150284042180
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70148576868800 !ruby/object:Gem::Requirement
+  requirement: &70150284041220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70148576868800
+  version_requirements: *70150284041220
 description: Basic Rails Framework files and assets for layout and authentication
 email: remosm@gmail.com
 executables: []
@@ -1030,9 +1030,12 @@ files:
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/welcome_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/helpers/welcome_helper.rb
 - test/dummy/app/models/user.rb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/welcome/index.html.erb
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
@@ -1054,14 +1057,17 @@ files:
 - test/dummy/db/migrate/20111203203123_create_users.rb
 - test/dummy/db/migrate/20111203203307_create_authentications.rb
 - test/dummy/db/schema.rb
+- test/dummy/db/test.sqlite3
+- test/dummy/log/development.log
+- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/Rakefile
 - test/dummy/script/rails
-- test/fixtures/authentications.yml
-- test/fixtures/users.yml
+- test/dummy/test/fixtures/authentications.yml
+- test/dummy/test/fixtures/users.yml
 - test/functional/authentications_controller_test.rb
 - test/functional/registrations_controller_test.rb
 - test/integration/navigation_test.rb
@@ -1097,9 +1103,12 @@ test_files:
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/welcome_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/helpers/welcome_helper.rb
 - test/dummy/app/models/user.rb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/welcome/index.html.erb
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
@@ -1121,14 +1130,17 @@ test_files:
 - test/dummy/db/migrate/20111203203123_create_users.rb
 - test/dummy/db/migrate/20111203203307_create_authentications.rb
 - test/dummy/db/schema.rb
+- test/dummy/db/test.sqlite3
+- test/dummy/log/development.log
+- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/Rakefile
 - test/dummy/script/rails
-- test/fixtures/authentications.yml
-- test/fixtures/users.yml
+- test/dummy/test/fixtures/authentications.yml
+- test/dummy/test/fixtures/users.yml
 - test/functional/authentications_controller_test.rb
 - test/functional/registrations_controller_test.rb
 - test/integration/navigation_test.rb