3 files changed, 6 insertions, 5 deletions
diff --git a/engines/billing/test/functional/subscriptions_controller_test.rb b/engines/billing/test/functional/subscriptions_controller_test.rb
index 1e98eff..592ffc3 100644
--- a/engines/billing/test/functional/subscriptions_controller_test.rb
+++ b/engines/billing/test/functional/subscriptions_controller_test.rb
@@ -53,13 +53,13 @@ class SubscriptionsControllerTest < ActionController::TestCase
 
  test "subscribe creates subscription" do
    user = find_record :user
-   user.expects(:save).returns(true)
    login user
    payment_methods = [stub(:token => 'user_token')]
    Braintree::Customer.any_instance.stubs(:payment_methods).returns(payment_methods)
-   user.expects(:save).returns(true)
 
+   user.expects(:update_attributes).returns(true).twice
    post :subscribe, :id => "1", :first_name => "Test", :last_name => "Testing", :company => "RGSoC", :email => "any@email.com", :phone => "555-888-1234"
+   user.validate
 
    assert assigns(:result).success?
    assert_not_nil flash[:success]
@@ -67,12 +67,13 @@ class SubscriptionsControllerTest < ActionController::TestCase
 
  test "unsubscribe cancels subscription" do
    user = find_record :user
-   user.expects(:save).returns(true)
    result = Braintree::Subscription.create(payment_method_token: 'user_token', plan_id: '1')
    user.subscription_id = result.subscription.id
    login user
 
+   user.expects(:update_attributes).returns(true)
    delete :unsubscribe, :id => "1"
+   user.validate
 
    assert assigns(:result).success?
    assert_not_nil flash[:success]
diff --git a/engines/support/test/unit/account_extension_test.rb b/engines/support/test/unit/account_extension_test.rb
index 0ecb1aa..1b97062 100644
--- a/engines/support/test/unit/account_extension_test.rb
+++ b/engines/support/test/unit/account_extension_test.rb
@@ -10,7 +10,7 @@ class AccountExtensionTest < ActiveSupport::TestCase
     t = FactoryGirl.create :ticket_with_creator
     u = t.created_by_user
     Account.new(u).destroy
-    assert_equal nil, Ticket.find(t.id)
+    assert_nil Ticket.find(t.id)
   end
 
 end
diff --git a/engines/support/test/unit/ticket_test.rb b/engines/support/test/unit/ticket_test.rb
index 373f06c..048704c 100644
--- a/engines/support/test/unit/ticket_test.rb
+++ b/engines/support/test/unit/ticket_test.rb
@@ -42,7 +42,7 @@ class TicketTest < ActiveSupport::TestCase
     t = FactoryGirl.create :ticket_with_creator
     u = t.created_by_user
     Ticket.destroy_all_from(u)
-    assert_equal nil, Ticket.find(t.id)
+    assert_nil Ticket.find(t.id)
   end
 =begin
 # TODO: do once have current_user stuff in order