mori 0.1.0 → 0.1.1

data/spec/features/invites_spec.rb

@@ -38,20 +38,20 @@ describe 'Inviting Users', :type => :feature do
       visit '/invites/asd234fdsasd234'
       page.current_path.should eq root_path
     end
-    it 'should redirect to the invites path if validation fails' do
-      visit "/invites/#{@user.invitation_token}"
-      User.should_receive(:accept_invitation).exactly(1).times.and_call_original
-      within(:css, '.edit_user') do
-        fill_in 'Password', :with => 'passwoasdfasdfasdasdf'
-        fill_in 'Password confirmation', :with => 'password123'
+    it 'should reject old tokens' do
+      Timecop.freeze(Date.today + 3.weeks) do
+        visit "/invites/#{@user.invitation_token}"
+        within(:css, '.edit_user') do
+          fill_in 'Password', :with => 'password123'
+          fill_in 'Password confirmation', :with => 'password123'
+        end
+        click_button 'Accept'
+        page.current_path.should eq "/invites/#{@user.invitation_token}"
+        page.has_content?(I18n.t('flashes.invalid_invitation_token'))
       end
-      click_button 'Accept'
-      page.current_path.should eq "/invites/#{@user.invitation_token}"
-      page.has_content?(I18n.t('flashes.passwords_dont_match')).should eq true
     end
     it 'should accept the invite and log the new user in' do
       visit "/invites/#{@user.invitation_token}"
-      User.should_receive(:accept_invitation).exactly(1).times.and_call_original
       within(:css, '.edit_user') do
         fill_in 'Password', :with => 'password123'
         fill_in 'Password confirmation', :with => 'password123'
@@ -59,6 +59,8 @@ describe 'Inviting Users', :type => :feature do
       click_button 'Accept'
       page.current_path.should eq Mori.configuration.dashboard_path
       page.has_content?(I18n.t('flashes.logged_in')).should be true
+      ::BCrypt::Password.new(@user.reload.password).should eq 'password123'
+      @user.confirmed.should eq true
     end
   end
 end

data/spec/features/passwords_spec.rb

@@ -24,7 +24,7 @@ describe 'Password Management', :type => :feature do
       page.has_content?('Reset My Password').should be true
     end
     it 'should change a users password when they go to the link from the email' do
-      Mori.configuration.user_model.forgot_password(@user.email)
+      @user.forgot_password
       user = Mori.configuration.user_model.find_by_email(@user.email)
       visit "/passwords/reset?token=#{user.password_reset_token}"
       within '.edit_user' do
@@ -36,7 +36,7 @@ describe 'Password Management', :type => :feature do
     end
     it 'should render the reset form again if the change failed' do
       Timecop.freeze(Date.today - 3.weeks) do
-        Mori.configuration.user_model.forgot_password(@user.email)
+        @user.forgot_password
       end
       user = Mori.configuration.user_model.find_by_email(@user.email)
       visit "/passwords/reset?token=#{user.password_reset_token}"
@@ -45,7 +45,11 @@ describe 'Password Management', :type => :feature do
         fill_in 'user_password_confirmation', :with => 'password123'
       end
       click_button 'Update Password'
-      page.has_content?('Expired Reset Token').should be true
+      page.has_content?(I18n.t('flashes.invalid_password_reset_token')).should be true
+    end
+    it 'should redirect if no token' do
+      visit '/passwords/reset'
+      page.current_path.should eq root_path
     end
     it 'should redirect if no user is found' do
       visit '/passwords/reset?token=123asdf123'
@@ -95,7 +99,7 @@ describe 'Password Management', :type => :feature do
         fill_in 'new_password_confirmation', :with => 'potatwo'
       end
       click_button 'Change Password'
-      page.has_content?(I18n.t('flashes.passwords_did_not_match')).should be true
+      page.has_content?(I18n.t('flashes.password_change_failed')).should be true
     end
   end
 end

data/spec/helpers/mori_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 describe MoriHelper do
   it 'should return the logout link' do
-    logout_link.should eq link_to('Log Out', '/logout', :method => :delete)
+    mori_logout_link.should eq link_to('Log Out', '/logout', :method => :delete)
   end
 end

data/spec/models/mori/user_spec.rb

@@ -81,19 +81,9 @@ describe User do
         @user = User.find_by_email(email)
       end
       it 'should set their password' do
-        User.accept_invitation(@user.invitation_token, password, password)
+        @user.accept_invitation(password)
         @user.reload.password.should_not eq password
       end
-      it 'should not be able to use a stale token' do
-        Timecop.freeze(Date.today + 3.weeks) do
-          valid, message = User.accept_invitation(
-            @user.invitation_token,
-            password,
-            password)
-          valid.should eq false
-          message.should eq 'Expired Invitation Token'
-        end
-      end
     end
   end
 
@@ -103,26 +93,16 @@ describe User do
   describe 'Resetting their password' do
     before(:each) do
       @user = create(:mori_minimal_user)
-      User.forgot_password(@user.email)
-      @user = User.find_by_email('email@example.com')
+      @user.forgot_password
+      @user = User.find_by_email(@user.email)
     end
     it 'should be able to reset password' do
       @user.password_reset_token.should_not be nil
       @user.password_reset_sent.should eq Date.today
     end
-    it 'should require a valid reset token' do
-      expect { User.reset_password('token123', password) }.to raise_error
-      token = @user.password_reset_token
-      User.reset_password(token, password, password)
-      ::BCrypt::Password.new(@user.reload.password).should eq password
-    end
-    it 'should not be able to use an old token' do
-      token = @user.password_reset_token
-      ::Timecop.freeze(Date.today + 3.weeks) do
-        valid, message = User.reset_password(token, password, password)
-        valid.should eq false
-        message.should eq 'Expired Reset Token'
-      end
+    it 'should change their password' do
+      @user.reset_password("password123")
+      ::BCrypt::Password.new(@user.reload.password).should eq "password123"
     end
   end
 
@@ -135,19 +115,9 @@ describe User do
       @user = create(:mori_minimal_user)
     end
     it 'should be able to change their password' do
-      @user.change_password('123456789sdf', password2, password2)
+      @user.change_password(password2)
       ::BCrypt::Password.new(@user.reload.password).should eq password2
     end
-    it 'should return false if both new passwords don\'t match' do
-      valid, message = @user.change_password('123456789sdf', password2, 'potato')
-      valid.should eq false
-      message.should eq I18n.t('flashes.passwords_did_not_match')
-    end
-    it 'should raise an error if the incorrect password is provided' do
-      valid, message = @user.change_password(password2, password, password)
-      valid.should eq false
-      message.should eq I18n.t('flashes.password_change_failed')
-    end
   end
 
   #########################################
@@ -158,23 +128,9 @@ describe User do
     before :each do
       @user = create(:mori_minimal_user)
     end
-    it 'should require a valid token' do
-      valid, message = User.confirm_email('tokentoken123')
-      valid.should eq false
-      message.should eq 'Invalid Confirmation Token'
-    end
-    it 'should require the token to be recent' do
-      token = @user.confirmation_token
-      ::Timecop.freeze(Date.today + 3.weeks) do
-        valid, message = User.confirm_email(token)
-        valid.should eq false
-        message.should eq 'Expired Confirmation Token'
-      end
-    end
     it 'should set confirmed to true' do
-      valid, message = User.confirm_email(@user.confirmation_token)
-      valid.should eq true
-      message.should eq 'Email Confirmed'
+      @user.confirm_email
+      @user.reload.confirmed.should eq true
     end
   end
 
@@ -189,7 +145,7 @@ describe User do
     it 'resetting their password' do
       user = create(:mori_minimal_user)
       MoriMailer.should_receive(:forgot_password).and_call_original
-      User.forgot_password(user.email)
+      user.forgot_password
     end
     it 'confirming their email' do
       MoriMailer.should_receive(:confirm_email).and_call_original

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mori
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Aaron Miler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -114,6 +114,7 @@ files:
 - lib/generators/mori/install/templates/db/migrate/add_mori_to_users.rb
 - lib/generators/mori/install/templates/db/migrate/create_users.rb
 - lib/generators/mori/install/templates/mori.rb
+- lib/generators/mori/install/templates/README
 - lib/generators/mori/install/templates/user.rb
 - lib/generators/mori/views/USAGE
 - lib/generators/mori/views/views_generator.rb
@@ -129,8 +130,6 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.md
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/user.rb
@@ -252,8 +251,6 @@ signing_key:
 specification_version: 4
 summary: Mori is a user authentication platform
 test_files:
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/user.rb

data/spec/dummy/app/assets/javascripts/application.js

@@ -1,15 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .

data/spec/dummy/app/assets/stylesheets/application.css

@@ -1,13 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require_tree .
- */