summaryrefslogtreecommitdiff
path: root/tests/white-box/webapp.rb
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2015-11-12 10:00:27 +0100
committerkwadronaut <kwadronaut@leap.se>2015-11-12 10:00:27 +0100
commit92cc2b1118e98a4fb086d7c62a140dbfc845f4b0 (patch)
tree92896619c0cf4ace177cecfbdea6cbbbb9bc8419 /tests/white-box/webapp.rb
parent81467100826ad95266a4c29b11a2ecef759dd782 (diff)
parent7d0b6b25e49a1ccb70c4f502f7dfc58878b900cc (diff)
Merge remote-tracking branch 'origin/develop' into HEAD
Diffstat (limited to 'tests/white-box/webapp.rb')
-rw-r--r--tests/white-box/webapp.rb30
1 files changed, 1 insertions, 29 deletions
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)