summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/helpers/bonafide_helper.rb15
-rw-r--r--tests/white-box/couchdb.rb3
-rw-r--r--tests/white-box/webapp.rb30
3 files changed, 16 insertions, 32 deletions
diff --git a/tests/helpers/bonafide_helper.rb b/tests/helpers/bonafide_helper.rb
index 9b26eaaf..82db3973 100644
--- a/tests/helpers/bonafide_helper.rb
+++ b/tests/helpers/bonafide_helper.rb
@@ -32,7 +32,15 @@ class LeapTest
def assert_create_user
user = SRP::User.new
url = api_url("/1/users.json")
- assert_post(url, user.to_params) do |body|
+
+ params = user.to_params
+
+ if property('webapp.invite_required')
+ @invite_code = generate_invite_code
+ params['user[invite_code]'] = @invite_code
+ end
+
+ assert_post(url, params) do |body|
assert response = JSON.parse(body), 'response should be JSON'
assert response['ok'], "Creating a user should be successful, got #{response.inspect} instead."
end
@@ -40,6 +48,11 @@ class LeapTest
return user
end
+ def generate_invite_code
+ `cd /srv/leap/webapp/ && sudo -u leap-webapp RAILS_ENV=production bundle exec rake generate_invites[1]`.gsub(/\n/, "")
+ end
+
+
#
# attempts to authenticate user. if successful,
# user object is updated with id and session token.
diff --git a/tests/white-box/couchdb.rb b/tests/white-box/couchdb.rb
index 5ee12ff3..edb28eac 100644
--- a/tests/white-box/couchdb.rb
+++ b/tests/white-box/couchdb.rb
@@ -9,7 +9,6 @@ class CouchDB < LeapTest
end
def test_00_Are_daemons_running?
- assert_running '^tapicero', :single => true
if multimaster?
assert_running 'bin/beam'
assert_running 'bin/epmd'
@@ -70,7 +69,7 @@ class CouchDB < LeapTest
end
def test_04_Do_ACL_users_exist?
- acl_users = ['_design/_auth', 'leap_mx', 'nickserver', 'soledad', 'tapicero', 'webapp', 'replication']
+ acl_users = ['_design/_auth', 'leap_mx', 'nickserver', 'soledad', 'webapp', 'replication']
url = couchdb_backend_url("/_users/_all_docs", :username => 'admin')
assert_get(url) do |body|
response = JSON.parse(body)
diff --git a/tests/white-box/webapp.rb b/tests/white-box/webapp.rb
index 9956eb35..48507521 100644
--- a/tests/white-box/webapp.rb
+++ b/tests/white-box/webapp.rb
@@ -41,34 +41,6 @@ class Webapp < LeapTest
pass
end
- def test_05_Can_create_and_authenticate_and_delete_user_via_API?
- if property('webapp.allow_registration')
- assert_tmp_user
- pass
- else
- skip "New user registrations are disabled."
- end
- end
-
- def test_06_Can_sync_Soledad?
- return unless property('webapp.allow_registration')
- soledad_config = property('definition_files.soledad_service')
- if soledad_config && !soledad_config.empty?
- soledad_server = pick_soledad_server(soledad_config)
- if soledad_server
- assert_tmp_user do |user|
- assert_user_db_exists(user)
- command = File.expand_path "../../helpers/soledad_sync.py", __FILE__
- soledad_url = "https://#{soledad_server}/user-#{user.id}"
- assert_run "#{command} #{user.id} #{user.session_token} #{soledad_url}"
- pass
- end
- end
- else
- skip 'No soledad service configuration'
- end
- end
-
private
def url_options
@@ -95,7 +67,7 @@ class Webapp < LeapTest
end
#
- # returns true if the per-user db created by tapicero exists.
+ # returns true if the per-user db created by soledad-server exists.
# we try three times, and give up after that.
#
def assert_user_db_exists(user)