Merge pull request #131 from elijh/feature/locale-routes

locale prefix support

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')