devise_token_auth 0.1.21.alpha1 → 0.1.21.alpha2

data/test/controllers/devise_token_auth/confirmations_controller_test.rb

@@ -7,81 +7,83 @@ require 'test_helper'
 #  was the appropriate message delivered in the json payload?
 
 class DeviseTokenAuth::ConfirmationsControllerTest < ActionController::TestCase
-  describe DeviseTokenAuth::ConfirmationsController, "Confirmation" do
-    before do
-      @new_user = users(:unconfirmed_email_user)
-      @new_user.send_confirmation_instructions
-      @mail  = ActionMailer::Base.deliveries.last
-      @token = @mail.body.match(/confirmation_token=(.*)\"/)[1]
-    end
-
-    test 'should generate raw token' do
-      assert @token
-    end
-
-    test "should store token hash in user" do
-      assert @new_user.confirmation_token
-    end
-
-    describe "success" do
+  describe DeviseTokenAuth::ConfirmationsController do
+    describe "Confirmation" do
       before do
-        xhr :get, :show, {confirmation_token: @token}
-        @user = assigns(:user)
+        @new_user = users(:unconfirmed_email_user)
+        @new_user.send_confirmation_instructions
+        @mail  = ActionMailer::Base.deliveries.last
+        @token = @mail.body.match(/confirmation_token=(.*)\"/)[1]
       end
 
-      test "user should now be confirmed" do
-        assert @user.confirmed?
+      test 'should generate raw token' do
+        assert @token
       end
 
-      test "should redirect to success url" do
-        assert_redirected_to(/^#{@user.confirm_success_url}/)
+      test "should store token hash in user" do
+        assert @new_user.confirmation_token
       end
-    end
 
-    describe "failure" do
-      test "user should not be confirmed" do
-        assert_raises(ActionController::RoutingError) {
-          xhr :get, :show, {confirmation_token: "bogus"}
-        }
-        @user = assigns(:user)
-        refute @user.confirmed?
-      end
-    end
-  end
+      describe "success" do
+        before do
+          xhr :get, :show, {confirmation_token: @token}
+          @user = assigns(:user)
+        end
 
-  # test with non-standard user class
-  describe DeviseTokenAuth::ConfirmationsController, "Alternate user class" do
-    setup do
-      @request.env['devise.mapping'] = Devise.mappings[:mang]
-    end
+        test "user should now be confirmed" do
+          assert @user.confirmed?
+        end
 
-    teardown do
-      @request.env['devise.mapping'] = Devise.mappings[:user]
-    end
+        test "should redirect to success url" do
+          assert_redirected_to(/^#{@user.confirm_success_url}/)
+        end
+      end
 
-    before do
-      @new_user = mangs(:unconfirmed_email_user)
-      @new_user.send_confirmation_instructions
-      @mail  = ActionMailer::Base.deliveries.last
-      @token = @mail.body.match(/confirmation_token=(.*)\"/)[1]
+      describe "failure" do
+        test "user should not be confirmed" do
+          assert_raises(ActionController::RoutingError) {
+            xhr :get, :show, {confirmation_token: "bogus"}
+          }
+          @user = assigns(:user)
+          refute @user.confirmed?
+        end
+      end
     end
 
-    test 'should generate raw token' do
-      assert @token
-    end
+    # test with non-standard user class
+    describe "Alternate user model" do
+      setup do
+        @request.env['devise.mapping'] = Devise.mappings[:mang]
+      end
 
-    test "should store token hash in user" do
-      assert @new_user.confirmation_token
-    end
+      teardown do
+        @request.env['devise.mapping'] = Devise.mappings[:user]
+      end
 
-    describe "success" do
       before do
-        xhr :get, :show, {confirmation_token: @token}
-        @user = assigns(:user)
+        @new_user = mangs(:unconfirmed_email_user)
+        @new_user.send_confirmation_instructions
+        @mail  = ActionMailer::Base.deliveries.last
+        @token = @mail.body.match(/confirmation_token=(.*)\"/)[1]
       end
 
-      test "user should now be confirmed" do
-        assert @user.confirmed?
+      test 'should generate raw token' do
+        assert @token
+      end
+
+      test "should store token hash in user" do
+        assert @new_user.confirmation_token
+      end
+
+      describe "success" do
+        before do
+          xhr :get, :show, {confirmation_token: @token}
+          @user = assigns(:user)
+        end
+
+        test "user should now be confirmed" do
+          assert @user.confirmed?
+        end
       end
     end
   end

data/test/controllers/devise_token_auth/passwords_controller_test.rb

@@ -7,197 +7,198 @@ require 'test_helper'
 #  was the appropriate message delivered in the json payload?
 
 class DeviseTokenAuth::PasswordsControllerTest < ActionController::TestCase
-  describe DeviseTokenAuth::PasswordsController, "Password reset" do
-    before do
-      @user = users(:confirmed_email_user)
-      @redirect_url = 'http://ng-token-auth.dev'
-    end
-
-    describe 'request password reset' do
+  describe DeviseTokenAuth::PasswordsController do
+    describe "Password reset" do
       before do
-        xhr :post, :create, {
-          email:        @user.email,
-          redirect_url: @redirect_url
-        }
-
-        @mail = ActionMailer::Base.deliveries.last
-        @user.reload
-
-        @mail_reset_token  = @mail.body.match(/reset_password_token=(.*)\"/)[1]
-        @mail_redirect_url = CGI.unescape(@mail.body.match(/redirect_url=(.*)&amp;/)[1])
-      end
-
-      test 'response should return success status' do
-        assert_equal 200, response.status
-      end
-
-      test 'action should save password_reset_redirect_url to user table' do
-        assert_equal @redirect_url, @user.reset_password_redirect_url
-      end
-
-      test 'action should send an email' do
-        assert @mail
-      end
-
-      test 'the email should be addressed to the user' do
-        assert_equal @mail.to.first, @user.email
-      end
-
-      test 'the email body should contain a link with redirect url as a query param' do
-        assert_equal @redirect_url, @mail_redirect_url
-      end
-
-      test 'the email body should contain a link with reset token as a query param' do
-        user = User.reset_password_by_token({
-          reset_password_token: @mail_reset_token
-        })
-
-        assert_equal user.id, @user.id
+        @user = users(:confirmed_email_user)
+        @redirect_url = 'http://ng-token-auth.dev'
       end
 
-      describe 'password reset link failure' do
-        test 'request should not be authorized' do
-          assert_raises(ActionController::RoutingError) {
-            xhr :get, :edit, {
-              reset_password_token: 'bogus',
-              redirect_url: @mail_redirect_url
-            }
-          }
-        end
-      end
-
-      describe 'password reset link success' do
+      describe 'request password reset' do
         before do
-          xhr :get, :edit, {
-            reset_password_token: @mail_reset_token,
-            redirect_url: @mail_redirect_url
+          xhr :post, :create, {
+            email:        @user.email,
+            redirect_url: @redirect_url
           }
 
+          @mail = ActionMailer::Base.deliveries.last
           @user.reload
 
-          @uri = URI.parse(response.location)
-          @qs = CGI::parse(@uri.query)
+          @mail_reset_token  = @mail.body.match(/reset_password_token=(.*)\"/)[1]
+          @mail_redirect_url = CGI.unescape(@mail.body.match(/redirect_url=(.*)&amp;/)[1])
+        end
 
-          @client_id      = @qs["client_id"].first
-          @expiry         = @qs["expiry"].first
-          @reset_password = @qs["reset_password"].first
-          @token          = @qs["token"].first
-          @uid            = @qs["uid"].first
+        test 'response should return success status' do
+          assert_equal 200, response.status
         end
 
-        test 'respones should have success redirect status' do
-          assert_equal 302, response.status
+        test 'action should save password_reset_redirect_url to user table' do
+          assert_equal @redirect_url, @user.reset_password_redirect_url
         end
 
-        test 'response should contain auth params' do
-          assert @client_id
-          assert @expiry
-          assert @reset_password
-          assert @token
-          assert @uid
+        test 'action should send an email' do
+          assert @mail
         end
 
-        test 'response auth params should be valid' do
-          assert @user.valid_token?(@token, @client_id)
+        test 'the email should be addressed to the user' do
+          assert_equal @mail.to.first, @user.email
         end
-      end
-    end
 
-    describe "change password" do
-      describe 'success' do
-        before do
-          @auth_header = @user.create_new_auth_token
-          request.headers['Authorization'] = @auth_header
-          @new_password = Faker::Internet.password
+        test 'the email body should contain a link with redirect url as a query param' do
+          assert_equal @redirect_url, @mail_redirect_url
+        end
 
-          xhr :put, :update, {
-            password: @new_password,
-            password_confirmation: @new_password
-          }
+        test 'the email body should contain a link with reset token as a query param' do
+          user = User.reset_password_by_token({
+            reset_password_token: @mail_reset_token
+          })
 
-          @user.reload
+          assert_equal user.id, @user.id
         end
 
-        test "request should be successful" do
-          assert_equal 200, response.status
+        describe 'password reset link failure' do
+          test 'request should not be authorized' do
+            assert_raises(ActionController::RoutingError) {
+              xhr :get, :edit, {
+                reset_password_token: 'bogus',
+                redirect_url: @mail_redirect_url
+              }
+            }
+          end
         end
 
-        test "new password should authenticate user" do
-          assert @user.valid_password?(@new_password)
+        describe 'password reset link success' do
+          before do
+            xhr :get, :edit, {
+              reset_password_token: @mail_reset_token,
+              redirect_url: @mail_redirect_url
+            }
+
+            @user.reload
+
+            @uri = URI.parse(response.location)
+            @qs = CGI::parse(@uri.query)
+
+            @client_id      = @qs["client_id"].first
+            @expiry         = @qs["expiry"].first
+            @reset_password = @qs["reset_password"].first
+            @token          = @qs["token"].first
+            @uid            = @qs["uid"].first
+          end
+
+          test 'respones should have success redirect status' do
+            assert_equal 302, response.status
+          end
+
+          test 'response should contain auth params' do
+            assert @client_id
+            assert @expiry
+            assert @reset_password
+            assert @token
+            assert @uid
+          end
+
+          test 'response auth params should be valid' do
+            assert @user.valid_token?(@token, @client_id)
+          end
         end
       end
 
-      describe 'password mismatch error' do
-        before do
-          @auth_header = @user.create_new_auth_token
-          request.headers['Authorization'] = @auth_header
-          @new_password = Faker::Internet.password
+      describe "change password" do
+        describe 'success' do
+          before do
+            @auth_header = @user.create_new_auth_token
+            request.headers['Authorization'] = @auth_header
+            @new_password = Faker::Internet.password
 
-          xhr :put, :update, {
-            password: 'chong',
-            password_confirmation: 'bong'
-          }
-        end
+            xhr :put, :update, {
+              password: @new_password,
+              password_confirmation: @new_password
+            }
+
+            @user.reload
+          end
+
+          test "request should be successful" do
+            assert_equal 200, response.status
+          end
 
-        test 'response should fail' do
-          assert_equal 422, response.status
+          test "new password should authenticate user" do
+            assert @user.valid_password?(@new_password)
+          end
         end
-      end
 
-      describe 'unauthorized user' do
-        before do
-          @auth_header = @user.create_new_auth_token
-          @new_password = Faker::Internet.password
+        describe 'password mismatch error' do
+          before do
+            @auth_header = @user.create_new_auth_token
+            request.headers['Authorization'] = @auth_header
+            @new_password = Faker::Internet.password
 
-          xhr :put, :update, {
-            password: @new_password,
-            password_confirmation: @new_password
-          }
+            xhr :put, :update, {
+              password: 'chong',
+              password_confirmation: 'bong'
+            }
+          end
+
+          test 'response should fail' do
+            assert_equal 422, response.status
+          end
         end
 
-        test 'response should fail' do
-          assert_equal 401, response.status
+        describe 'unauthorized user' do
+          before do
+            @auth_header = @user.create_new_auth_token
+            @new_password = Faker::Internet.password
+
+            xhr :put, :update, {
+              password: @new_password,
+              password_confirmation: @new_password
+            }
+          end
+
+          test 'response should fail' do
+            assert_equal 401, response.status
+          end
         end
       end
     end
-  end
 
-  describe DeviseTokenAuth::PasswordsController, "Alternate user class" do
-    setup do
-      @request.env['devise.mapping'] = Devise.mappings[:mang]
-    end
+    describe "Alternate user class" do
+      setup do
+        @request.env['devise.mapping'] = Devise.mappings[:mang]
+      end
 
-    teardown do
-      @request.env['devise.mapping'] = Devise.mappings[:user]
-    end
+      teardown do
+        @request.env['devise.mapping'] = Devise.mappings[:user]
+      end
 
-    before do
-      @user = mangs(:confirmed_email_user)
-      @redirect_url = 'http://ng-token-auth.dev'
+      before do
+        @user = mangs(:confirmed_email_user)
+        @redirect_url = 'http://ng-token-auth.dev'
 
-      xhr :post, :create, {
-        email:        @user.email,
-        redirect_url: @redirect_url
-      }
+        xhr :post, :create, {
+          email:        @user.email,
+          redirect_url: @redirect_url
+        }
 
-      @mail = ActionMailer::Base.deliveries.last
-      @user.reload
+        @mail = ActionMailer::Base.deliveries.last
+        @user.reload
 
-      @mail_reset_token  = @mail.body.match(/reset_password_token=(.*)\"/)[1]
-      @mail_redirect_url = CGI.unescape(@mail.body.match(/redirect_url=(.*)&amp;/)[1])
-    end
+        @mail_reset_token  = @mail.body.match(/reset_password_token=(.*)\"/)[1]
+        @mail_redirect_url = CGI.unescape(@mail.body.match(/redirect_url=(.*)&amp;/)[1])
+      end
 
-    test 'response should return success status' do
-      assert_equal 200, response.status
-    end
+      test 'response should return success status' do
+        assert_equal 200, response.status
+      end
 
-    test 'the email body should contain a link with reset token as a query param' do
-      user = Mang.reset_password_by_token({
-        reset_password_token: @mail_reset_token
-      })
+      test 'the email body should contain a link with reset token as a query param' do
+        user = Mang.reset_password_by_token({
+          reset_password_token: @mail_reset_token
+        })
 
-      assert_equal user.id, @user.id
+        assert_equal user.id, @user.id
+      end
     end
   end
 end
-