diff options
| author | jessib <jessib@riseup.net> | 2013-10-08 10:44:50 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-10-08 10:44:50 -0700 |
| commit | 8b378d916caeaf7fd4b1da2aea45eab4b0ccbb39 (patch) | |
| tree | d830a124871a7e6e23ea57b8d538f3572567d5e0 | |
| parent | fe79b34965145f1ece98644bf1537866880cc230 (diff) | |
Minor tweaks.
| -rw-r--r-- | billing/app/views/subscriptions/_subscription_details.html.haml | 2 | ||||
| -rw-r--r-- | billing/test/functional/customers_controller_test.rb | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/billing/app/views/subscriptions/_subscription_details.html.haml b/billing/app/views/subscriptions/_subscription_details.html.haml index fcf4bc4..3a06c20 100644 --- a/billing/app/views/subscriptions/_subscription_details.html.haml +++ b/billing/app/views/subscriptions/_subscription_details.html.haml @@ -17,7 +17,7 @@ Plan: = subscription.plan_id Price: - = subscription.price + = number_to_currency(subscription.price) - color = (subscription.status == 'Active') ? "green" : "red" Status: %font{:color => color} 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 |