Merge tag '0.7.0'

Releasing 0.7.0

1 files changed, 9 insertions, 4 deletions

diff --git a/tests/white-box/webapp.rb b/tests/white-box/webapp.rb
index 9f104899..1e78c8a5 100644
--- a/tests/white-box/webapp.rb
+++ b/tests/white-box/webapp.rb
@@ -42,11 +42,16 @@ class Webapp < LeapTest
   end
 
   def test_05_Can_create_and_authenticate_and_delete_user_via_API?
-    assert_tmp_user
-    pass
+    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)
@@ -96,14 +101,14 @@ class Webapp < LeapTest
   def assert_user_db_exists(user)
     last_body, last_response, last_error = nil
     3.times do
-      sleep 0.1
+      sleep 0.2
       get(couchdb_url("/user-#{user.id}/_design/docs")) do |body, response, error|
         last_body, last_response, last_error = body, response, error
         if response.code.to_i == 200
           return
         end
       end
-      sleep 0.2
+      sleep 0.5
     end
     assert false, "Could not find user db for test user #{user.username}\nuuid=#{user.id}\nHTTP #{last_response.code} #{last_error} #{last_body}"
   end