summaryrefslogtreecommitdiff
path: root/billing/test/functional
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2013-08-12 12:10:05 -0700
committerjessib <jessib@riseup.net>2013-08-12 12:10:05 -0700
commitd895a582df7c8f333c0aa1b97b555fbd8e4ea50f (patch)
tree7fd940bf4ac8dd394d7a25a07329d5469a17dfa0 /billing/test/functional
parent8d9d7b369d99b40d709ac49b124f8c3f67579202 (diff)
parent466e22fa896d307f26cddab7a2e1302cf3a0f1fc (diff)
Merge pull request #2 from azul/feature/billing-with-passing-tests
fix billing tests to use user id with customer resources
Diffstat (limited to 'billing/test/functional')
-rw-r--r--billing/test/functional/customer_controller_test.rb2
-rw-r--r--billing/test/functional/customers_controller_test.rb2
2 files changed, 2 insertions, 2 deletions
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