devise_token_auth 0.1.21.alpha1 → 0.1.21.alpha2

data/test/controllers/devise_token_auth/registrations_controller_test.rb

@@ -7,156 +7,158 @@ require 'test_helper'
 #  was the appropriate message delivered in the json payload?
 
 class DeviseTokenAuth::RegistrationsControllerTest < ActionController::TestCase
-  describe DeviseTokenAuth::RegistrationsController, "Successful registration" do
-    before do
-      xhr :post, :create, {
-        email: -> { Faker::Internet.email },
-        password: "secret123",
-        password_confirmation: "secret123",
-        confirm_success_url: -> { Faker::Internet.url }
-      }
-
-      @user = assigns(:resource)
-      @data = JSON.parse(response.body)
-      @mail = ActionMailer::Base.deliveries.last
-    end
-
-    test "request should be successful" do
-      assert_equal 200, response.status
-    end
-
-    test "user should have been created" do
-      assert @user.id
-    end
-
-    test "user should not be confirmed" do
-      assert_nil @user.confirmed_at
-    end
-
-    test "new user data should be returned as json" do
-      assert @data['data']['email']
-    end
-
-    test "new user should receive confirmation email" do
-      assert_equal @user.email, @mail['to'].to_s
-    end
-
-    test "new user password should not be returned" do
-      assert_nil @data['data']['password']
-    end
-  end
-
-  describe DeviseTokenAuth::RegistrationsController, "Mismatched passwords" do
-    before do
-      xhr :post, :create, {
-        email: -> { Faker::Internet.email },
-        password: "secret123",
-        password_confirmation: "bogus",
-        confirm_success_url: -> { Faker::Internet.url }
-      }
-
-      @user = assigns(:resource)
-      @data = JSON.parse(response.body)
-    end
-
-    test "request should not be successful" do
-      assert_equal 403, response.status
-    end
-
-    test "user should have been created" do
-      assert_nil @user.id
-    end
-
-    test "error should be returned in the response" do
-      assert @data['errors'].length
-    end
-  end
-
-  describe DeviseTokenAuth::RegistrationsController, "Existing users" do
-    before do
-      @existing_user = users(:confirmed_email_user)
+  describe DeviseTokenAuth::RegistrationsController do
+    describe "Successful registration" do
+      before do
+        xhr :post, :create, {
+          email: -> { Faker::Internet.email },
+          password: "secret123",
+          password_confirmation: "secret123",
+          confirm_success_url: -> { Faker::Internet.url }
+        }
+
+        @user = assigns(:resource)
+        @data = JSON.parse(response.body)
+        @mail = ActionMailer::Base.deliveries.last
+      end
+
+      test "request should be successful" do
+        assert_equal 200, response.status
+      end
+
+      test "user should have been created" do
+        assert @user.id
+      end
 
-      xhr :post, :create, {
-        email: @existing_user.email,
-        password: "secret123",
-        password_confirmation: "secret123",
-        confirm_success_url: -> { Faker::Internet.url }
-      }
+      test "user should not be confirmed" do
+        assert_nil @user.confirmed_at
+      end
+
+      test "new user data should be returned as json" do
+        assert @data['data']['email']
+      end
+
+      test "new user should receive confirmation email" do
+        assert_equal @user.email, @mail['to'].to_s
+      end
+
+      test "new user password should not be returned" do
+        assert_nil @data['data']['password']
+      end
+    end
+
+    describe "Mismatched passwords" do
+      before do
+        xhr :post, :create, {
+          email: -> { Faker::Internet.email },
+          password: "secret123",
+          password_confirmation: "bogus",
+          confirm_success_url: -> { Faker::Internet.url }
+        }
+
+        @user = assigns(:resource)
+        @data = JSON.parse(response.body)
+      end
+
+      test "request should not be successful" do
+        assert_equal 403, response.status
+      end
+
+      test "user should have been created" do
+        assert_nil @user.id
+      end
+
+      test "error should be returned in the response" do
+        assert @data['errors'].length
+      end
+    end
+
+    describe "Existing users" do
+      before do
+        @existing_user = users(:confirmed_email_user)
+
+        xhr :post, :create, {
+          email: @existing_user.email,
+          password: "secret123",
+          password_confirmation: "secret123",
+          confirm_success_url: -> { Faker::Internet.url }
+        }
+
+        @user = assigns(:resource)
+        @data = JSON.parse(response.body)
+      end
+
+      test "request should not be successful" do
+        assert_equal 403, response.status
+      end
+
+      test "user should have been created" do
+        assert_nil @user.id
+      end
+
+      test "error should be returned in the response" do
+        assert @data['errors'].length
+      end
+    end
+
+
+    describe "Ouath user has existing email" do
+      before do
+        @existing_user = users(:duplicate_email_facebook_user)
+
+        xhr :post, :create, {
+          email: @existing_user.email,
+          password: "secret123",
+          password_confirmation: "secret123",
+          confirm_success_url: -> { Faker::Internet.url }
+        }
+
+        @user = assigns(:resource)
+        @data = JSON.parse(response.body)
+      end
 
-      @user = assigns(:resource)
-      @data = JSON.parse(response.body)
-    end
-
-    test "request should not be successful" do
-      assert_equal 403, response.status
-    end
-
-    test "user should have been created" do
-      assert_nil @user.id
-    end
-
-    test "error should be returned in the response" do
-      assert @data['errors'].length
-    end
-  end
-
-
-  describe DeviseTokenAuth::RegistrationsController, "Ouath user has existing email" do
-    before do
-      @existing_user = users(:duplicate_email_facebook_user)
-
-      xhr :post, :create, {
-        email: @existing_user.email,
-        password: "secret123",
-        password_confirmation: "secret123",
-        confirm_success_url: -> { Faker::Internet.url }
-      }
-
-      @user = assigns(:resource)
-      @data = JSON.parse(response.body)
-    end
-
-    test "request should be successful" do
-      assert_equal 200, response.status
-    end
-
-    test "user should have been created" do
-      assert @user.id
-    end
-
-    test "new user data should be returned as json" do
-      assert @data['data']['email']
-    end
-  end
-
-  describe DeviseTokenAuth::RegistrationsController, "Alternate user class" do
-    setup do
-      @request.env['devise.mapping'] = Devise.mappings[:mang]
-    end
+      test "request should be successful" do
+        assert_equal 200, response.status
+      end
 
-    teardown do
-      @request.env['devise.mapping'] = Devise.mappings[:user]
-    end
+      test "user should have been created" do
+        assert @user.id
+      end
 
-    before do
-      xhr :post, :create, {
-        email: -> { Faker::Internet.email },
-        password: "secret123",
-        password_confirmation: "secret123",
-        confirm_success_url: -> { Faker::Internet.url }
-      }
-
-      @user = assigns(:resource)
-      @data = JSON.parse(response.body)
-      @mail = ActionMailer::Base.deliveries.last
+      test "new user data should be returned as json" do
+        assert @data['data']['email']
+      end
     end
 
-    test "request should be successful" do
-      assert_equal 200, response.status
-    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
+
+      before do
+        xhr :post, :create, {
+          email: -> { Faker::Internet.email },
+          password: "secret123",
+          password_confirmation: "secret123",
+          confirm_success_url: -> { Faker::Internet.url }
+        }
+
+        @user = assigns(:resource)
+        @data = JSON.parse(response.body)
+        @mail = ActionMailer::Base.deliveries.last
+      end
+
+      test "request should be successful" do
+        assert_equal 200, response.status
+      end
 
-    test "use should be a Mang" do
-      assert_equal "Mang", @user.class.name
+      test "use should be a Mang" do
+        assert_equal "Mang", @user.class.name
+      end
     end
   end
 end

data/test/controllers/devise_token_auth/sessions_controller_test.rb

@@ -7,40 +7,81 @@ require 'test_helper'
 #  was the appropriate message delivered in the json payload?
 
 class DeviseTokenAuth::SessionsControllerTest < ActionController::TestCase
-  describe DeviseTokenAuth::SessionsController, "Confirmed user" do
-    before do
-      @existing_user = users(:confirmed_email_user)
-      @existing_user.skip_confirmation!
-      @existing_user.save!
+  describe DeviseTokenAuth::SessionsController do
+    describe "Confirmed user" do
+      before do
+        @existing_user = users(:confirmed_email_user)
+        @existing_user.skip_confirmation!
+        @existing_user.save!
+      end
+
+      describe 'success' do
+        before do
+          xhr :post, :create, {
+            email: @existing_user.email,
+            password: 'secret123'
+          }
+
+          @user = assigns(:user)
+          @data = JSON.parse(response.body)
+        end
+
+        test "request should succeed" do
+          assert_equal 200, response.status
+        end
+
+        test "request should return user data" do
+          assert_equal @existing_user.email, @data['data']['email']
+        end
+      end
+
+      describe 'failure' do
+        before do
+          xhr :post, :create, {
+            email: @existing_user.email,
+            password: 'bogus'
+          }
+
+          @user = assigns(:user)
+          @data = JSON.parse(response.body)
+        end
+
+        test "request should fail" do
+          assert_equal 401, response.status
+        end
+
+        test "response should contain errors" do
+          assert @data['errors']
+        end
+      end
     end
 
-    describe 'success' do
+    describe "Unconfirmed user" do
       before do
+        @unconfirmed_user = users(:unconfirmed_email_user)
         xhr :post, :create, {
-          email: @existing_user.email,
+          email: @unconfirmed_user.email,
           password: 'secret123'
         }
-
         @user = assigns(:user)
         @data = JSON.parse(response.body)
       end
 
-      test "request should succeed" do
-        assert_equal 200, response.status
+      test "request should fail" do
+        assert_equal 401, response.status
       end
 
-      test "request should return user data" do
-        assert_equal @existing_user.email, @data['data']['email']
+      test "response should contain errors" do
+        assert @data['errors']
       end
     end
 
-    describe 'failure' do
+    describe "Non-existing user" do
       before do
         xhr :post, :create, {
-          email: @existing_user.email,
-          password: 'bogus'
+          email: -> { Faker::Internet.email },
+          password: -> { Faker::Number.number(10) }
         }
-
         @user = assigns(:user)
         @data = JSON.parse(response.body)
       end
@@ -53,76 +94,37 @@ class DeviseTokenAuth::SessionsControllerTest < ActionController::TestCase
         assert @data['errors']
       end
     end
-  end
-
-  describe DeviseTokenAuth::SessionsController, "Unconfirmed user" do
-    before do
-      @unconfirmed_user = users(:unconfirmed_email_user)
-      xhr :post, :create, {
-        email: @unconfirmed_user.email,
-        password: 'secret123'
-      }
-      @user = assigns(:user)
-      @data = JSON.parse(response.body)
-    end
 
-    test "request should fail" do
-      assert_equal 401, response.status
-    end
-
-    test "response should contain errors" do
-      assert @data['errors']
-    end
-  end
-
-  describe DeviseTokenAuth::SessionsController, "Non-existing user" do
-    before do
-      xhr :post, :create, {
-        email: -> { Faker::Internet.email },
-        password: -> { Faker::Number.number(10) }
-      }
-      @user = assigns(:user)
-      @data = JSON.parse(response.body)
-    end
-
-    test "request should fail" do
-      assert_equal 401, response.status
-    end
-
-    test "response should contain errors" do
-      assert @data['errors']
-    end
-  end
-
-  describe DeviseTokenAuth::SessionsController, "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
-      @existing_user = mangs(:confirmed_email_user)
-      @existing_user.skip_confirmation!
-      @existing_user.save!
+      before do
+        @existing_user = mangs(:confirmed_email_user)
+        @existing_user.skip_confirmation!
+        @existing_user.save!
 
-      xhr :post, :create, {
-        email: @existing_user.email,
-        password: 'secret123'
-      }
+        xhr :post, :create, {
+          email: @existing_user.email,
+          password: 'secret123'
+        }
 
-      @user = assigns(:user)
-      @data = JSON.parse(response.body)
-    end
+        @user = assigns(:user)
+        @data = JSON.parse(response.body)
+      end
 
-    test "request should succeed" do
-      assert_equal 200, response.status
-    end
+      test "request should succeed" do
+        assert_equal 200, response.status
+      end
 
-    test "request should return user data" do
-      assert_equal @existing_user.email, @data['data']['email']
+      test "request should return user data" do
+        assert_equal @existing_user.email, @data['data']['email']
+      end
     end
   end
 end