1 files changed, 9 insertions, 27 deletions

diff --git a/src/leap/soledad/tests/test_leap_backend.py b/src/leap/soledad/tests/test_leap_backend.py
index 8afae6f6..d04ee412 100644
--- a/src/leap/soledad/tests/test_leap_backend.py
+++ b/src/leap/soledad/tests/test_leap_backend.py
@@ -23,32 +23,28 @@ Test Leap backend bits.
 import u1db
 import os
 import ssl
-try:
-    import simplejson as json
-except ImportError:
-    import json  # noqa
+import simplejson as json
 import cStringIO
 
+
 from u1db.sync import Synchronizer
 from u1db.remote import (
     http_client,
     http_database,
     http_target,
 )
+from routes.mapper import Mapper
 
 from leap import soledad
 from leap.soledad.backends import leap_backend
 from leap.soledad.server import (
     SoledadApp,
-    SoledadAuthMiddleware
+    SoledadAuthMiddleware,
 )
 from leap.soledad import auth
 
 
 from leap.soledad.tests import u1db_tests as tests
-from leap.soledad.tests.u1db_tests.test_remote_sync_target import (
-    make_oauth_http_app,
-)
 from leap.soledad.tests import BaseSoledadTest
 from leap.soledad.tests.u1db_tests import test_backends
 from leap.soledad.tests.u1db_tests import test_http_database
@@ -81,8 +77,13 @@ def make_token_soledad_app(state):
             return True
         return False
 
+    # we test for action authorization in leap.soledad.tests.test_server
+    def verify_action(environ, uuid):
+        return True
+
     application = SoledadAuthMiddleware(app)
     application.verify_token = verify_token
+    application.verify_action = verify_action
     return application
 
 
@@ -128,12 +129,6 @@ def copy_token_http_database_for_test(test, db):
 class LeapTests(test_backends.AllDatabaseTests, BaseSoledadTest):
 
     scenarios = LEAP_SCENARIOS + [
-        ('oauth_http', {'make_database_for_test':
-                        test_backends.make_oauth_http_database_for_test,
-                        'copy_database_for_test':
-                        test_backends.copy_oauth_http_database_for_test,
-                        'make_document_for_test': make_leap_document_for_test,
-                        'make_app_with_state': make_oauth_http_app}),
         ('token_http', {'make_database_for_test':
                         make_token_http_database_for_test,
                         'copy_database_for_test':
@@ -362,13 +357,6 @@ def leap_sync_target(test, path):
         test.getURL(path), crypto=test._soledad._crypto)
 
 
-def oauth_leap_sync_target(test, path):
-    st = leap_sync_target(test, '~/' + path)
-    st.set_oauth_credentials(tests.consumer1.key, tests.consumer1.secret,
-                             tests.token1.key, tests.token1.secret)
-    return st
-
-
 def token_leap_sync_target(test, path):
     st = leap_sync_target(test, path)
     st.set_token_credentials('user-uuid', 'auth-token')
@@ -379,12 +367,6 @@ class TestLeapSyncTarget(
         test_remote_sync_target.TestRemoteSyncTargets, BaseSoledadTest):
 
     scenarios = [
-        ('http', {'make_app_with_state': make_soledad_app,
-                  'make_document_for_test': make_leap_document_for_test,
-                  'sync_target': leap_sync_target}),
-        ('oauth_http', {'make_app_with_state': make_oauth_http_app,
-                        'make_document_for_test': make_leap_document_for_test,
-                        'sync_target': oauth_leap_sync_target}),
         ('token_soledad',
             {'make_app_with_state': make_token_soledad_app,
              'make_document_for_test': make_leap_document_for_test,