summaryrefslogtreecommitdiff
path: root/billing
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2013-12-22 06:39:37 -0800
committerazul <azul@riseup.net>2013-12-22 06:39:37 -0800
commit4c5851dfac51453571427535419469fe1b73a81d (patch)
treebc5356220eaca2465bd135f45edf8000d6c254be /billing
parent5bf1462140a7aa17ea815ccc5105ace6fa878d83 (diff)
parent665964bcbba69829a4ff1e7d7bd936f90d49b3f7 (diff)
Merge pull request #131 from elijh/feature/locale-routes
locale prefix support
Diffstat (limited to 'billing')
-rw-r--r--billing/config/routes.rb33
-rw-r--r--billing/test/integration/subscription_test.rb2
2 files changed, 18 insertions, 17 deletions
diff --git a/billing/config/routes.rb b/billing/config/routes.rb
index dbdc24b..7263dff 100644
--- a/billing/config/routes.rb
+++ b/billing/config/routes.rb
@@ -1,24 +1,25 @@
Rails.application.routes.draw do
- match 'payments/new' => 'payments#new', :as => :new_payment
- match 'payments/confirm' => 'payments#confirm', :as => :confirm_payment
- resources :users do
- resources :payments, :only => [:index]
- resources :subscriptions, :only => [:index, :show, :destroy]
- end
-
- resources :customer, :only => [:new, :edit]
- resources :credit_card_info, :only => [:edit]
+ scope "(:locale)", :locale => MATCH_LOCALE do
+ match 'payments/new' => 'payments#new', :as => :new_payment
+ match 'payments/confirm' => 'payments#confirm', :as => :confirm_payment
+ resources :users do
+ resources :payments, :only => [:index]
+ resources :subscriptions, :only => [:index, :show, :destroy]
+ end
- match 'customer/confirm/' => 'customer#confirm', :as => :confirm_customer
- match 'customer/show/:id' => 'customer#show', :as => :show_customer
- match 'credit_card_info/confirm' => 'credit_card_info#confirm', :as => :confirm_credit_card_info
+ resources :customer, :only => [:new, :edit]
+ resources :credit_card_info, :only => [:edit]
- resources :subscriptions, :only => [:new, :create, :update] # index, show & destroy are within users path
- match 'billing_admin' => 'billing_admin#show', :as => :billing_admin
+ match 'customer/confirm/' => 'customer#confirm', :as => :confirm_customer
+ match 'customer/show/:id' => 'customer#show', :as => :show_customer
+ match 'credit_card_info/confirm' => 'credit_card_info#confirm', :as => :confirm_credit_card_info
- #match 'transactions/:product_id/new' => 'transactions#new', :as => :new_transaction
- #match 'transactions/confirm/:product_id' => 'transactions#confirm', :as => :confirm_transaction
+ resources :subscriptions, :only => [:new, :create, :update] # index, show & destroy are within users path
+ match 'billing_admin' => 'billing_admin#show', :as => :billing_admin
+ #match 'transactions/:product_id/new' => 'transactions#new', :as => :new_transaction
+ #match 'transactions/confirm/:product_id' => 'transactions#confirm', :as => :confirm_transaction
+ end
end
diff --git a/billing/test/integration/subscription_test.rb b/billing/test/integration/subscription_test.rb
index 6356177..b95bfac 100644
--- a/billing/test/integration/subscription_test.rb
+++ b/billing/test/integration/subscription_test.rb
@@ -29,7 +29,7 @@ class SubscriptionTest < ActionDispatch::IntegrationTest
login_as @admin
@customer.stubs(:subscriptions).returns([@subscription])
@subscription.stubs(:balance).returns 0
- visit user_subscriptions_path(@customer.user_id)
+ visit user_subscriptions_path(@customer.user_id, :locale => nil)
assert page.has_content?("Subscriptions")
assert page.has_content?("Status: Active")
page.save_screenshot('/tmp/subscriptions.png')