From 852687b31c9600a95cc96c27d50112bc93702488 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Fri, 16 Mar 2012 17:35:47 -0700 Subject: [PATCH] MS DG fix a few final tests --- app/controllers/registrations_controller.rb | 3 ++- features/accepts_invitation.feature | 2 +- features/step_definitions/user_steps.rb | 5 +++++ spec/controllers/registrations_controller_spec.rb | 4 ++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 544531a6a..e1483aa71 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -29,7 +29,8 @@ class RegistrationsController < Devise::RegistrationsController private def check_valid_invite! - return true if invite.can_be_used? + return true unless AppConfig[:registrations_closed] #this sucks + return true if invite && invite.can_be_used? flash[:error] = t('registrations.invalid_invite') redirect_to new_user_session_path end diff --git a/features/accepts_invitation.feature b/features/accepts_invitation.feature index 440574e6c..f10dcc827 100644 --- a/features/accepts_invitation.feature +++ b/features/accepts_invitation.feature @@ -38,7 +38,7 @@ Feature: invitation acceptance And I log out And I sign in as "bob@bob.bob" And I follow "By email" - Then I should see "9 invites left" + Then I should see one less invite Scenario: sends an invitation Given a user with email "bob@bob.bob" diff --git a/features/step_definitions/user_steps.rb b/features/step_definitions/user_steps.rb index 1a042f010..b7c62a60b 100644 --- a/features/step_definitions/user_steps.rb +++ b/features/step_definitions/user_steps.rb @@ -34,10 +34,15 @@ end Given /^I have been invited by bob$/ do @inviter = Factory(:user, :email => 'bob@bob.bob') + @inviter_invite_count = @inviter.invitation_code.count i = EmailInviter.new("new_invitee@example.com", @inviter) i.send! end +When /^I should see one less invite$/ do + step "I should see \"#{@inviter_invite_count -1} invites left\"" +end + When /^I click on my name$/ do click_link("#{@me.first_name} #{@me.last_name}") end diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb index a6b4a2777..f1ff07342 100644 --- a/spec/controllers/registrations_controller_spec.rb +++ b/spec/controllers/registrations_controller_spec.rb @@ -54,6 +54,10 @@ describe RegistrationsController do describe "#create" do context "with valid parameters" do + before do + AppConfig[:registrations_closed] = false + end + before do user = Factory.build(:user) User.stub!(:build).and_return(user)