devise_invitable 1.7.5 → 2.0.5

data/test/functional/registrations_controller_test.rb

@@ -10,37 +10,37 @@ class DeviseInvitable::RegistrationsControllerTest < ActionController::TestCase
     # josevalim: you are required to do that because the routes sets this kind
     # of stuff automatically. But functional tests are not using the routes.
     # see https://github.com/plataformatec/devise/issues/1196
-    @request.env["devise.mapping"] = Devise.mappings[:user]
+    @request.env['devise.mapping'] = Devise.mappings[:user]
   end
 
   test "invited users may still sign up directly by themselves" do
     # invite the invitee
     sign_in @issuer
-    invitee_email = "invitee@example.org"
+    invitee_email = 'invitee@example.org'
 
-    User.invite!(:email => invitee_email) do |u|
+    User.invite!(email: invitee_email) do |u|
       u.skip_invitation = true
       u.invited_by = @issuer
     end
     sign_out @issuer
 
-    @invitee = User.where(:email => invitee_email).first
+    @invitee = User.where(email: invitee_email).first
     assert_nil @invitee.invitation_accepted_at
     assert_not_nil @invitee.invitation_token
     assert !@invitee.confirmed?
 
     # sign_up the invitee
     assert_difference('ActionMailer::Base.deliveries.size') do
-      post :create, params: {:user => {:email => invitee_email, :password => "1password", :bio => '.'}}
+      post :create, params: { user: { email: invitee_email, password: '1password', bio: '.' } }
     end
 
-    @invitee = User.where(:email => invitee_email).first
+    @invitee = User.where(email: invitee_email).first
 
     # do not send emails on model changes
     assert_difference('ActionMailer::Base.deliveries.size', 0) do
-      @invitee.bio = "I am a robot"
+      @invitee.bio = 'I am a robot'
       @invitee.save!
-      @invitee.bio = "I am a human"
+      @invitee.bio = 'I am a human'
       @invitee.save!
     end
 
@@ -54,20 +54,20 @@ class DeviseInvitable::RegistrationsControllerTest < ActionController::TestCase
   end
 
   test "non-invited users may still sign up directly by themselves" do
-    register_email = "invitee@example.org"
+    register_email = 'invitee@example.org'
     # sign_up the invitee
     assert_difference('ActionMailer::Base.deliveries.size') do
-      post :create, params: {:user => {:email => register_email, :password => "1password", :bio => '.'}}
+      post :create, params: { user: { email: register_email, password: '1password', bio: '.' } }
     end
     assert_nil @controller.current_user
 
-    @user = User.where(:email => register_email).first
+    @user = User.where(email: register_email).first
 
     # do not send emails on model changes
     assert_no_difference('ActionMailer::Base.deliveries.size') do
-      @user.bio = "I am a robot"
+      @user.bio = 'I am a robot'
       @user.save!
-      @user.bio = "I am a human"
+      @user.bio = 'I am a human'
       @user.save!
     end
 
@@ -80,36 +80,35 @@ class DeviseInvitable::RegistrationsControllerTest < ActionController::TestCase
   end
 
   test "not invitable resources can register" do
-    @request.env["devise.mapping"] = Devise.mappings[:admin]
-    invitee_email = "invitee@example.org"
+    @request.env['devise.mapping'] = Devise.mappings[:admin]
+    invitee_email = 'invitee@example.org'
 
-    assert_nil Admin.where(:email => invitee_email).first
+    assert_nil Admin.where(email: invitee_email).first
 
-    post :create, params: {:admin => {:email => invitee_email, :password => "1password"}}
+    post :create, params: { admin: { email: invitee_email, password: '1password' } }
 
-    @invitee = Admin.where(:email => invitee_email).first
+    @invitee = Admin.where(email: invitee_email).first
     assert @invitee.encrypted_password.present?
   end
 
   test "not invitable resources are not logged in after sign up again" do
-    @request.env["devise.mapping"] = Devise.mappings[:admin]
-    invitee_email = "invitee@example.org"
+    @request.env['devise.mapping'] = Devise.mappings[:admin]
+    invitee_email = 'invitee@example.org'
 
-    post :create, params: {:admin => {:email => invitee_email, :password => "1password"}}
+    post :create, params: { admin: { email: invitee_email, password: '1password' } }
     assert_response 302
 
-    @invitee = Admin.where(:email => invitee_email).first
+    @invitee = Admin.where(email: invitee_email).first
     assert @invitee.encrypted_password.present?
 
     sign_out @invitee
-    post :create, params: {:admin => {:email => invitee_email, :password => "2password"}}
+    post :create, params: { admin: { email: invitee_email, password: "2password" } }
     assert_response 200
-    assert_equal @invitee.encrypted_password, Admin.where(:email => invitee_email).first.encrypted_password
+    assert_equal @invitee.encrypted_password, Admin.where(email: invitee_email).first.encrypted_password
     assert @controller.send(:resource).errors.present?
   end
 
   test "missing params on a create should not cause an error" do
-
     assert_nothing_raised { post :create }
   end
 end

data/test/generators/views_generator_test.rb

@@ -28,13 +28,14 @@ class ViewsGeneratorTest < ::Rails::Generators::TestCase
   end
 
   private
-  def assert_files
-    assert views = { @invitations_path => %w/edit.html.erb new.html.erb/, @mailer_path => %w/invitation_instructions.html.erb/ }
 
-    views.each do |path, files|
-      files.each do |file|
-        assert_file File.join path, file
+    def assert_files
+      assert views = { @invitations_path => %w/edit.html.erb new.html.erb/, @mailer_path => %w/invitation_instructions.html.erb/ }
+
+      views.each do |path, files|
+        files.each do |file|
+          assert_file File.join path, file
+        end
       end
     end
-  end
 end

data/test/generators_test.rb

@@ -17,13 +17,14 @@ class GeneratorsTest < ActiveSupport::TestCase
 
   test "rails g devise_invitable:install" do
     @output = `cd #{RAILS_APP_PATH} && rails g devise_invitable:install -p`
-    assert @output.match(%r{(inject|insert).*  config/initializers/devise\.rb\n})
+    puts @output
+    assert @output.match(%r{(inject|insert|File unchanged! The supplied flag value not found!).*  config/initializers/devise\.rb\n})
     assert @output.match(%r|create.*  config/locales/devise_invitable\.en\.yml\n|)
   end
 
   test "rails g devise_invitable Octopussy" do
     @output = `cd #{RAILS_APP_PATH} && rails g devise_invitable Octopussy -p`
-    assert @output.match(%r{(inject|insert).*  app/models/octopussy\.rb\n})
+    assert @output.match(%r{(inject|insert|File unchanged! The supplied flag value not found!).*  app/models/octopussy\.rb\n})
     assert @output.match(%r|invoke.*  #{DEVISE_ORM}\n|)
     if DEVISE_ORM == :active_record
       assert @output.match(%r|create.*  db/migrate/\d{14}_devise_invitable_add_to_octopussies\.rb\n|)

data/test/integration/invitation_remove_test.rb

@@ -4,26 +4,26 @@ require 'integration_tests_helper'
 class InvitationRemoveTest < ActionDispatch::IntegrationTest
 
   test 'invited user can choose to remove his account/invite' do
-    User.invite!(:email => "valid@email.com")
+    User.invite!(email: 'valid@email.com')
 
     # remove!
-    visit remove_user_invitation_path(:invitation_token => Thread.current[:token])
+    visit remove_user_invitation_path(invitation_token: Thread.current[:token])
     assert_equal root_path, current_path
-    assert page.has_css?('p#notice', :text => 'Your invitation was removed.')
+    assert page.has_css?('p#notice', text: 'Your invitation was removed.')
     
     # try to remove again!
-    visit remove_user_invitation_path(:invitation_token => Thread.current[:token])
+    visit remove_user_invitation_path(invitation_token: Thread.current[:token])
     assert_equal root_path, current_path
-    assert page.has_css?('p#alert', :text => 'The invitation token provided is not valid!')
+    assert page.has_css?('p#alert', text: 'The invitation token provided is not valid!')
   end
 
   test 'accepted user cannot remove his account (by using the original invitation token)' do
-    user = User.invite!(:email => "valid@email.com")
+    user = User.invite!(email: 'valid@email.com')
     saved_token = Thread.current[:token]
     user.accept_invitation!
     
-    visit remove_user_invitation_path(:invitation_token =>  saved_token)
+    visit remove_user_invitation_path(invitation_token: saved_token)
     assert_equal root_path, current_path
-    assert page.has_css?('p#alert', :text => 'The invitation token provided is not valid!')
+    assert page.has_css?('p#alert', text: 'The invitation token provided is not valid!')
   end
 end

data/test/integration/invitation_test.rb

@@ -9,18 +9,18 @@ class InvitationTest < ActionDispatch::IntegrationTest
   def send_invitation(url = new_user_invitation_path, &block)
     visit url
 
-    fill_in 'user_email', :with => 'user@test.com'
+    fill_in 'user_email', with: 'user@test.com'
     yield if block_given?
     click_button 'Send an invitation'
   end
 
-  def set_password(options={}, &block)
+  def set_password(options = {}, &block)
     unless options[:visit] == false
-      visit accept_user_invitation_path(:invitation_token => options[:invitation_token])
+      visit accept_user_invitation_path(invitation_token: options[:invitation_token])
     end
 
-    fill_in 'user_password', :with => '987654321'
-    fill_in 'user_password_confirmation', :with => '987654321'
+    fill_in 'user_password', with: '987654321'
+    fill_in 'user_password_confirmation', with: '987654321'
     yield if block_given?
     click_button options[:button] || 'Set my password'
   end
@@ -28,7 +28,7 @@ class InvitationTest < ActionDispatch::IntegrationTest
   test 'not authenticated user should be able to send a free invitation' do
     send_invitation new_free_invitation_path
     assert_equal root_path, current_path
-    assert page.has_css?('p#notice', :text => 'An invitation email has been sent to user@test.com.')
+    assert page.has_css?('p#notice', text: 'An invitation email has been sent to user@test.com.')
   end
 
   test 'not authenticated user should not be able to send an invitation' do
@@ -41,19 +41,19 @@ class InvitationTest < ActionDispatch::IntegrationTest
 
     send_invitation
     assert_equal root_path, current_path
-    assert page.has_css?('p#notice', :text => 'An invitation email has been sent to user@test.com.')
+    assert page.has_css?('p#notice', text: 'An invitation email has been sent to user@test.com.')
   end
 
   test 'authenticated user with existing email should receive an error message' do
     user = create_full_user
     sign_in_as_user(user)
     send_invitation do
-      fill_in 'user_email', :with => user.email
+      fill_in 'user_email', with: user.email
     end
 
     assert_equal user_invitation_path, current_path
     assert page.has_css?("input[type=text][value='#{user.email}']")
-    assert page.has_css?('#error_explanation li', :text => 'Email has already been taken')
+    assert page.has_css?('#error_explanation li', text: 'Email has already been taken')
   end
 
   test 'authenticated user should not be able to visit edit invitation page' do
@@ -65,63 +65,63 @@ class InvitationTest < ActionDispatch::IntegrationTest
   end
 
   test 'invited user without password should not be able to sign in' do
-    user = User.invite!(:email => "valid@email.com")
+    user = User.invite!(email: 'valid@email.com')
     user.password = 'test'
     sign_in_as_user user
 
     assert_equal new_user_session_path, current_path
-    assert page.has_css?('p#alert', :text => 'You have a pending invitation, accept it to finish creating your account.')
+    assert page.has_css?('p#alert', text: 'You have a pending invitation, accept it to finish creating your account.')
   end
 
   test 'invited user with password should not be able to sign in' do
-    user = User.invite!(:email => "valid@email.com")
+    user = User.invite!(email: 'valid@email.com')
     user.password = '987654321'
     user.save
     sign_in_as_user user
 
     assert_equal new_user_session_path, current_path
-    assert page.has_css?('p#alert', :text => 'You have a pending invitation, accept it to finish creating your account.')
+    assert page.has_css?('p#alert', text: 'You have a pending invitation, accept it to finish creating your account.')
   end
 
   test 'not authenticated user with invalid invitation token should not be able to set his password' do
-    user = User.invite!(:email => "valid@email.com")
+    user = User.invite!(email: 'valid@email.com')
     user.accept_invitation!
-    visit accept_user_invitation_path(:invitation_token => 'invalid_token')
+    visit accept_user_invitation_path(invitation_token: 'invalid_token')
 
     assert_equal root_path, current_path
-    assert page.has_css?('p#alert', :text => 'The invitation token provided is not valid!')
+    assert page.has_css?('p#alert', text: 'The invitation token provided is not valid!')
   end
 
   test 'not authenticated user with valid invitation token but invalid password should not be able to set his password' do
-    user = User.invite!(:email => "valid@email.com")
-    set_password :invitation_token => Thread.current[:token] do
-      fill_in 'Password confirmation', :with => 'other_password'
+    user = User.invite!(email: 'valid@email.com')
+    set_password invitation_token: Thread.current[:token] do
+      fill_in 'Password confirmation', with: 'other_password'
     end
     assert_equal user_invitation_path, current_path
-    assert page.has_css?('#error_explanation li', :text => /Password .*doesn\'t match/)
+    assert page.has_css?('#error_explanation li', text: /Password .*doesn\'t match/)
     assert !user.confirmed?
   end
 
   test 'not authenticated user with valid data should be able to change his password' do
-    user = User.invite!(:email => "valid@email.com")
-    set_password :invitation_token => Thread.current[:token]
+    user = User.invite!(email: 'valid@email.com')
+    set_password invitation_token: Thread.current[:token]
 
     assert_equal root_path, current_path
-    assert page.has_css?('p#notice', :text => 'Your password was set successfully. You are now signed in.')
+    assert page.has_css?('p#notice', text: 'Your password was set successfully. You are now signed in.')
     assert user.reload.valid_password?('987654321')
     assert user.confirmed?
   end
 
   test 'after entering invalid data user should still be able to set his password' do
-    user = User.invite!(:email => "valid@email.com")
-    set_password :invitation_token => Thread.current[:token] do
-      fill_in 'Password confirmation', :with => 'other_password'
+    user = User.invite!(email: 'valid@email.com')
+    set_password invitation_token: Thread.current[:token] do
+      fill_in 'Password confirmation', with: 'other_password'
     end
     assert_equal user_invitation_path, current_path
     assert page.has_css?('#error_explanation')
 
-    set_password :visit => false
-    assert page.has_css?('p#notice', :text => 'Your password was set successfully. You are now signed in.')
+    set_password visit: false
+    assert page.has_css?('p#notice', text: 'Your password was set successfully. You are now signed in.')
     assert user.reload.valid_password?('987654321')
   end
 
@@ -129,8 +129,8 @@ class InvitationTest < ActionDispatch::IntegrationTest
     original_option_value = Devise.allow_insecure_sign_in_after_accept
     Devise.allow_insecure_sign_in_after_accept = true
 
-    User.invite!(:email => "valid@email.com")
-    set_password :invitation_token => Thread.current[:token]
+    User.invite!(email: 'valid@email.com')
+    set_password invitation_token: Thread.current[:token]
 
     assert_equal root_path, current_path
     Devise.allow_insecure_sign_in_after_accept = original_option_value
@@ -140,22 +140,22 @@ class InvitationTest < ActionDispatch::IntegrationTest
     original_option_value = Devise.allow_insecure_sign_in_after_accept
     Devise.allow_insecure_sign_in_after_accept = false
 
-    User.invite!(:email => "valid@email.com")
-    set_password :invitation_token => Thread.current[:token]
+    User.invite!(email: 'valid@email.com')
+    set_password invitation_token: Thread.current[:token]
 
     assert_equal new_user_session_path, current_path
     Devise.allow_insecure_sign_in_after_accept = original_option_value
   end
 
   test 'clear token and set invitation_accepted_at after recover password instead of accept_invitation' do
-    user = User.invite!(:email => "valid@email.com")
+    user = User.invite!(email: 'valid@email.com')
 
     visit new_user_password_path
-    fill_in 'user_email', :with => 'valid@email.com'
+    fill_in 'user_email', with: 'valid@email.com'
     click_button 'Send me reset password instructions'
 
-    visit edit_user_password_path(:reset_password_token => Thread.current[:token])
-    set_password :visit => false, :button => 'Change my password'
+    visit edit_user_password_path(reset_password_token: Thread.current[:token])
+    set_password visit: false, button: 'Change my password'
 
     user.reload
     assert_nil user.invitation_token
@@ -174,7 +174,7 @@ class InvitationTest < ActionDispatch::IntegrationTest
       send_invitation
     end
     assert_equal root_path, current_path
-    assert page.has_css?('p#notice', :text => 'An invitation email has been sent to user@test.com.')
+    assert page.has_css?('p#notice', text: 'An invitation email has been sent to user@test.com.')
     user = User.find(user.id)
     assert !user.has_invitations_left?
   end
@@ -191,7 +191,7 @@ class InvitationTest < ActionDispatch::IntegrationTest
       send_invitation
     end
     assert_equal user_invitation_path, current_path
-    assert page.has_css?('p#alert', :text => 'No invitations remaining')
+    assert page.has_css?('p#alert', text: 'No invitations remaining')
   end
 
   test 'user with nil invitation_limit should default to User.invitation_limit' do
@@ -204,7 +204,7 @@ class InvitationTest < ActionDispatch::IntegrationTest
 
     send_invitation
     assert_equal root_path, current_path
-    assert page.has_css?('p#notice', :text => 'An invitation email has been sent to user@test.com.')
+    assert page.has_css?('p#notice', text: 'An invitation email has been sent to user@test.com.')
     user = User.find(user.id)
     assert_equal 2, user.invitation_limit
   end
@@ -219,13 +219,13 @@ class InvitationTest < ActionDispatch::IntegrationTest
 
     send_invitation
     assert_equal root_path, current_path
-    assert page.has_css?('p#notice', :text => 'An invitation email has been sent to user@test.com.')
+    assert page.has_css?('p#notice', text: 'An invitation email has been sent to user@test.com.')
     user = User.find(user.id)
     assert_equal 2, user.invitation_limit
 
     send_invitation
     assert_equal root_path, current_path
-    assert page.has_css?('p#notice', :text => 'An invitation email has been sent to user@test.com.')
+    assert page.has_css?('p#notice', text: 'An invitation email has been sent to user@test.com.')
     user = User.find(user.id)
     assert_equal 2, user.invitation_limit
   end
@@ -235,7 +235,7 @@ class InvitationTest < ActionDispatch::IntegrationTest
     sign_in_as_user(user)
     send_invitation
 
-    invited_user = User.where(:email => 'user@test.com').first
+    invited_user = User.where(email: 'user@test.com').first
     assert invited_user
     assert_equal user, invited_user.invited_by
   end
@@ -248,20 +248,20 @@ class InvitationTest < ActionDispatch::IntegrationTest
   end
 
   test 'authenticated admin should be able to send an admin invitation' do
-    admin = Admin.create(:email => 'admin@test.com', :password => '123456', :password_confirmation => '123456')
+    admin = Admin.create(email: 'admin@test.com', password: '123456', password_confirmation: '123456')
     sign_in_as_user admin
 
     send_invitation new_admin_path
     assert_equal root_path, current_path
-    assert page.has_css?('p#notice', :text => 'An invitation email has been sent to user@test.com.')
+    assert page.has_css?('p#notice', text: 'An invitation email has been sent to user@test.com.')
   end
 
   test 'authenticated admin should be redirected to own page after send a free invitation' do
-    admin = Admin.create(:email => 'admin@test.com', :password => '123456', :password_confirmation => '123456')
+    admin = Admin.create(email: 'admin@test.com', password: '123456', password_confirmation: '123456')
     sign_in_as_user admin
 
     send_invitation new_free_invitation_path
     assert_equal root_path, current_path
-    assert page.has_css?('p#notice', :text => 'An invitation email has been sent to user@test.com.')
+    assert page.has_css?('p#notice', text: 'An invitation email has been sent to user@test.com.')
   end
 end

data/test/integration_tests_helper.rb

@@ -7,11 +7,11 @@ class ActionDispatch::IntegrationTest
   def create_full_user
     @user ||= begin
       user = User.create!(
-        :username              => 'usertest',
-        :email                 => 'fulluser@test.com',
-        :password              => '123456',
-        :password_confirmation => '123456',
-        :created_at            => Time.now.utc
+        username: 'usertest',
+        email: 'fulluser@test.com',
+        password: '123456',
+        password_confirmation: '123456',
+        created_at: Time.now.utc,
       )
       user.confirm
       user
@@ -22,20 +22,19 @@ class ActionDispatch::IntegrationTest
     user ||= create_full_user
     resource_name = user.class.name.underscore
     visit send("new_#{resource_name}_session_path")
-    fill_in "#{resource_name}_email", :with => user.email
-    fill_in "#{resource_name}_password", :with => user.password
+    fill_in "#{resource_name}_email", with: user.email
+    fill_in "#{resource_name}_password", with: user.password
     click_button 'Log in'
   end
 
   # Fix assert_redirect_to in integration sessions because they don't take into
   # account Middleware redirects.
-  #
   def assert_redirected_to(url)
     assert [301, 302].include?(@integration_session.status),
            "Expected status to be 301 or 302, got #{@integration_session.status}"
 
     url = prepend_host(url)
-    location = prepend_host(@integration_session.headers["Location"])
+    location = prepend_host(@integration_session.headers['Location'])
     assert_equal url, location
   end