From 1cf4cc5c8d571b571367a08f5e201be868289ed1 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Wed, 16 Jan 2013 13:16:38 +0100
Subject: using subdomain for api requests properly

---
 users/config/routes.rb                             | 10 +++++-----
 users/test/integration/api/account_flow_test.rb    | 11 ++++++++---
 users/test/integration/api/python/flow_with_srp.py |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/users/config/routes.rb b/users/config/routes.rb
index 723d737..0c2d8d9 100644
--- a/users/config/routes.rb
+++ b/users/config/routes.rb
@@ -1,11 +1,11 @@
 Rails.application.routes.draw do
 
   constraints :subdomain => "api" do
-    namespace "api", :path => nil do
-      scope "/1", :module => "V1", defaults: {format: 'json'} do
-        resources :sessions, :only => [:new, :create, :update, :destroy]
-        resources :users, :only => [:create]
-      end
+    namespace "api", { module: "V1",
+        path: "/1/",
+        defaults: {format: 'json'} } do
+      resources :sessions, :only => [:new, :create, :update, :destroy]
+      resources :users, :only => [:create]
     end
   end
 
diff --git a/users/test/integration/api/account_flow_test.rb b/users/test/integration/api/account_flow_test.rb
index b9e2a4e..268fb5e 100644
--- a/users/test/integration/api/account_flow_test.rb
+++ b/users/test/integration/api/account_flow_test.rb
@@ -22,7 +22,7 @@ class AccountFlowTest < ActiveSupport::TestCase
       :password_verifier => @srp.verifier.to_s(16),
       :password_salt => @srp.salt.to_s(16)
     }
-    post '/1/users.json', :user => @user_params
+    post 'http://api.lvh.me:3000/1/users.json', :user => @user_params
     @user = User.find_by_param(@login)
   end
 
@@ -33,7 +33,10 @@ class AccountFlowTest < ActiveSupport::TestCase
 
   # this test wraps the api and implements the interface the ruby-srp client.
   def handshake(login, aa)
-    post "/1/sessions.json", :login => login, 'A' => aa.to_s(16), :format => :json
+    post "http://api.lvh.me:3000/1/sessions.json",
+      :login => login,
+      'A' => aa.to_s(16),
+      :format => :json
     response = JSON.parse(last_response.body)
     if response['errors']
       raise RECORD_NOT_FOUND.new(response['errors'])
@@ -43,7 +46,9 @@ class AccountFlowTest < ActiveSupport::TestCase
   end
 
   def validate(m)
-    put "/1/sessions/" + @login + '.json', :client_auth => m.to_s(16), :format => :json
+    put "http://api.lvh.me:3000/1/sessions/" + @login + '.json',
+      :client_auth => m.to_s(16),
+      :format => :json
     return JSON.parse(last_response.body)
   end
 
diff --git a/users/test/integration/api/python/flow_with_srp.py b/users/test/integration/api/python/flow_with_srp.py
index f28aeda..df83dfb 100755
--- a/users/test/integration/api/python/flow_with_srp.py
+++ b/users/test/integration/api/python/flow_with_srp.py
@@ -16,7 +16,7 @@ def id_generator(size=6, chars=string.ascii_uppercase + string.digits):
   return ''.join(random.choice(chars) for x in range(size))
 
 # using globals for a start
-server = 'http://localhost:3000/1'
+server = 'http://api.lvh.me:3000/1'
 login = id_generator()
 password = id_generator() + id_generator()
 
-- 
cgit v1.2.3