diff options
| author | Azul <azul@leap.se> | 2013-08-09 10:37:09 +0200 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-08-09 10:37:09 +0200 |
| commit | a6c564dd4e7c604eae062779c45a1303b67cfbf2 (patch) | |
| tree | 2db003addb78ee20ea2fd65f3c6372cd52ace2bb /billing | |
| parent | 8d9d7b369d99b40d709ac49b124f8c3f67579202 (diff) | |
fix billing tests to use user id with customer resources
I think this is very confusing and should be changed to:
resource :users do |user|
user.resource :customer
end
Diffstat (limited to 'billing')
| -rw-r--r-- | billing/app/helpers/billing_helper.rb | 3 | ||||
| -rw-r--r-- | billing/test/functional/customer_controller_test.rb | 2 | ||||
| -rw-r--r-- | billing/test/functional/customers_controller_test.rb | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/billing/app/helpers/billing_helper.rb b/billing/app/helpers/billing_helper.rb index 5272eab..3c0691f 100644 --- a/billing/app/helpers/billing_helper.rb +++ b/billing/app/helpers/billing_helper.rb @@ -10,7 +10,8 @@ module BillingHelper end def show_or_new_customer_link(user) - # Link to show if user is admin viewing another user, or user is already a customer. Otherwise link to create a new customer. + # Link to show if user is admin viewing another user, or user is already a customer. + # Otherwise link to create a new customer. if (admin? and (user != current_user)) or ((customer = Customer.find_by_user_id(user.id)) and customer.has_payment_info?) show_customer_path(user) else diff --git a/billing/test/functional/customer_controller_test.rb b/billing/test/functional/customer_controller_test.rb index 9bf2b5e..d7f221e 100644 --- a/billing/test/functional/customer_controller_test.rb +++ b/billing/test/functional/customer_controller_test.rb @@ -23,7 +23,7 @@ class CustomerControllerTest < ActionController::TestCase test "edit uses params[:id]" do customer = FactoryGirl.create :customer_with_payment_info login customer.user - get :edit, id: customer.id + get :edit, id: customer.user.id assert_response :success assert assigns(:tr_data) diff --git a/billing/test/functional/customers_controller_test.rb b/billing/test/functional/customers_controller_test.rb index 2a431da..02b3424 100644 --- a/billing/test/functional/customers_controller_test.rb +++ b/billing/test/functional/customers_controller_test.rb @@ -45,7 +45,7 @@ class CustomersControllerTest < ActionController::TestCase login @other_user get :new assert_response :redirect - assert_equal edit_customer_url(@customer), response.header['Location'] #todo should pass user not customer + assert_equal edit_customer_url(@customer.user), response.header['Location'] #todo should pass user not customer end |