3 files changed, 14 insertions, 6 deletions
diff --git a/billing/test/functional/customers_controller_test.rb b/billing/test/functional/customers_controller_test.rb
index d4881bf..46c33c9 100644
--- a/billing/test/functional/customers_controller_test.rb
+++ b/billing/test/functional/customers_controller_test.rb
@@ -7,10 +7,11 @@ class CustomersControllerTest < ActionController::TestCase
   setup do
     @user = FactoryGirl.create :user
     @other_user = FactoryGirl.create :user
-    FakeBraintree.clear!
-    FakeBraintree.verify_all_cards!
+    #FakeBraintree.clear!
+    #FakeBraintree.verify_all_cards!
     testid = 'testid'
-    FakeBraintree::Customer.new({:credit_cards => [{:number=>"5105105105105100", :expiration_date=>"05/2013"}]}, {:id => testid, :merchant_id => Braintree::Configuration.merchant_id})
+    #this wasn't actually being used
+    #FakeBraintree::Customer.new({:credit_cards => [{:number=>"5105105105105100", :expiration_date=>"05/2013"}]}, {:id => testid, :merchant_id => Braintree::Configuration.merchant_id})
     # any reason to call the create instance method on the FakeBraintree::Customer ?
     @customer = Customer.new(:user_id => @other_user.id)
     @customer.braintree_customer_id = testid
@@ -50,6 +51,7 @@ class CustomersControllerTest < ActionController::TestCase
 
 
   test "show" do
+    skip "show customer"
     login @other_user
     # Below will fail, as when we go to fetch the customer data, Braintree::Customer.find(params[:id]) won't find the customer as it is a FakeBraintree customer.
     #get :show, :id => @customer.braintree_customer_id
diff --git a/billing/test/functional/subsciptions_controller_test.rb b/billing/test/functional/subscriptions_controller_test.rb
index a6a1057..a6a1057 100644
--- a/billing/test/functional/subsciptions_controller_test.rb
+++ b/billing/test/functional/subscriptions_controller_test.rb
diff --git a/billing/test/integration/subscription_test.rb b/billing/test/integration/subscription_test.rb
index b893896..6356177 100644
--- a/billing/test/integration/subscription_test.rb
+++ b/billing/test/integration/subscription_test.rb
@@ -10,28 +10,34 @@ class SubscriptionTest < ActionDispatch::IntegrationTest
 
   setup do
     Warden.test_mode!
-    @admin = stub_record :user, :admin => true
+    @admin = User.find_by_login('admin') || FactoryGirl.create(:user, login: 'admin')
     @customer = stub_customer
     @braintree_customer = @customer.braintree_customer
     response = Braintree::Subscription.create plan_id: '5',
-      payment_method_token: @braintree_customer.credit_cards.first.token
+      payment_method_token: @braintree_customer.credit_cards.first.token,
+      price: '10'
     @subscription = response.subscription
     Capybara.current_driver = Capybara.javascript_driver
   end
 
   teardown do
     Warden.test_reset!
+    @admin.destroy
   end
 
-  test "admin can see subscription for another" do
+  test "admin can see all subscriptions for another" do
     login_as @admin
     @customer.stubs(:subscriptions).returns([@subscription])
+    @subscription.stubs(:balance).returns 0
     visit user_subscriptions_path(@customer.user_id)
     assert page.has_content?("Subscriptions")
     assert page.has_content?("Status: Active")
     page.save_screenshot('/tmp/subscriptions.png')
   end
 
+  # test "user cannot see all subscriptions for other user" do
+  #end
+
   #test "admin cannot add subscription for another" do
   #end