summaryrefslogtreecommitdiff
path: root/users/test/integration
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-12-12 00:09:57 +0100
committerAzul <azul@leap.se>2012-12-12 00:09:57 +0100
commit0871fd8938952d8b718c64d4d45535f7ae9fd742 (patch)
treeded6504b15bab40b42dd4bd60e4df2571be8bc61 /users/test/integration
parent7a9a4f4e7bd090fd27e05b03f93832d79f5f8db2 (diff)
parent1a26988cb7ff30061473f4a781166b184b3037ce (diff)
Merge branch 'master' into develop
Diffstat (limited to 'users/test/integration')
-rw-r--r--users/test/integration/api/account_flow_test.rb6
-rwxr-xr-xusers/test/integration/api/python/flow_with_srp.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/users/test/integration/api/account_flow_test.rb b/users/test/integration/api/account_flow_test.rb
index add12fe..e425c35 100644
--- a/users/test/integration/api/account_flow_test.rb
+++ b/users/test/integration/api/account_flow_test.rb
@@ -26,7 +26,7 @@ class AccountFlowTest < ActiveSupport::TestCase
:password_verifier => @srp.verifier.to_s(16),
:password_salt => @srp.salt.to_s(16)
}
- post '/users.json', :user => @user_params
+ post '/1/users.json', :user => @user_params
@user = User.find_by_param(@login)
end
@@ -36,7 +36,7 @@ class AccountFlowTest < ActiveSupport::TestCase
# this test wraps the api and implements the interface the ruby-srp client.
def handshake(login, aa)
- post "/sessions.json", :login => login, 'A' => aa.to_s(16), :format => :json
+ post "/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'])
@@ -46,7 +46,7 @@ class AccountFlowTest < ActiveSupport::TestCase
end
def validate(m)
- put "/sessions/" + @login + '.json', :client_auth => m.to_s(16), :format => :json
+ put "/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 b599252..f28aeda 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://springbok.leap.se/1/'
+server = 'http://localhost:3000/1'
login = id_generator()
password = id_generator() + id_generator()