Closes #147 (#328)

* Closes #147

* Fixing tests

* Ensuring we can validate max dates.

lemur/tests/conftest.py

@@ -137,6 +137,7 @@ def issuer_plugin():
     from lemur.plugins.base import register
     from .plugins.issuer_plugin import TestIssuerPlugin
     register(TestIssuerPlugin)
+    return TestIssuerPlugin
 
 
 @pytest.yield_fixture(scope="function")
@@ -147,7 +148,7 @@ def logged_in_user(app):
 
 
 @pytest.yield_fixture(scope="function")
-def logged_in_admin(app):
+def logged_in_admin(session, app):
     with app.test_request_context():
         identity_changed.send(current_app._get_current_object(), identity=Identity(2))
         yield

lemur/tests/factories.py

@@ -1,7 +1,7 @@
 
 from datetime import date
 
-from factory import Sequence, post_generation
+from factory import Sequence, post_generation, SubFactory
 from factory.alchemy import SQLAlchemyModelFactory
 from factory.fuzzy import FuzzyChoice, FuzzyText, FuzzyDate
 
@@ -14,7 +14,7 @@ from lemur.notifications.models import Notification
 from lemur.users.models import User
 from lemur.roles.models import Role
 
-from .vectors import INTERNAL_VALID_LONG_STR, INTERNAL_VALID_SAN_STR, PRIVATE_KEY_STR
+from .vectors import INTERNAL_VALID_SAN_STR, PRIVATE_KEY_STR
 
 
 class BaseFactory(SQLAlchemyModelFactory):
@@ -26,27 +26,6 @@ class BaseFactory(SQLAlchemyModelFactory):
         sqlalchemy_session = db.session
 
 
-class AuthorityFactory(BaseFactory):
-    """Authority factory."""
-    name = Sequence(lambda n: 'authority{0}'.format(n))
-    owner = 'joe@example.com'
-    plugin_name = 'test-issuer'
-    body = INTERNAL_VALID_LONG_STR
-
-    class Meta:
-        """Factory configuration."""
-        model = Authority
-
-    @post_generation
-    def roles(self, create, extracted, **kwargs):
-        if not create:
-            return
-
-        if extracted:
-            for role in extracted:
-                self.roles.append(role)
-
-
 class CertificateFactory(BaseFactory):
     """Certificate factory."""
     name = Sequence(lambda n: 'certificate{0}'.format(n))
@@ -135,6 +114,27 @@ class CertificateFactory(BaseFactory):
                 self.roles.append(domain)
 
 
+class AuthorityFactory(BaseFactory):
+    """Authority factory."""
+    name = Sequence(lambda n: 'authority{0}'.format(n))
+    owner = 'joe@example.com'
+    plugin = {'slug': 'test-issuer'}
+    authority_certificate = SubFactory(CertificateFactory)
+
+    class Meta:
+        """Factory configuration."""
+        model = Authority
+
+    @post_generation
+    def roles(self, create, extracted, **kwargs):
+        if not create:
+            return
+
+        if extracted:
+            for role in extracted:
+                self.roles.append(role)
+
+
 class DestinationFactory(BaseFactory):
     """Destination factory."""
     plugin_name = Sequence(lambda n: 'destination{0}'.format(n))

lemur/tests/test_authorities.py

@@ -25,14 +25,6 @@ def test_authority_input_schema(client, role):
     assert not errors
 
 
-@pytest.mark.parametrize("token, count", [
-    (VALID_USER_HEADER_TOKEN, 0),
-    (VALID_ADMIN_HEADER_TOKEN, 1)
-])
-def test_admin_authority(client, authority, token, count):
-    assert client.get(api.url_for(AuthoritiesList), headers=token).json['total'] == count
-
-
 def test_user_authority(session, client, authority, role, user):
     assert client.get(api.url_for(AuthoritiesList), headers=user['token']).json['total'] == 0
     u = user['user']
@@ -45,9 +37,23 @@ def test_user_authority(session, client, authority, role, user):
     assert client.get(api.url_for(AuthoritiesList), headers=user['token']).json['total'] == 0
 
 
+def test_create_authority(issuer_plugin, logged_in_admin):
+    from lemur.authorities.service import create
+    authority = create(plugin={'plugin_object': issuer_plugin, 'slug': issuer_plugin.slug}, owner='jim@example.com', type='root')
+    assert authority.authority_certificate
+
+
+@pytest.mark.parametrize("token, count", [
+    (VALID_USER_HEADER_TOKEN, 0),
+    (VALID_ADMIN_HEADER_TOKEN, 3)
+])
+def test_admin_authority(client, authority, token, count):
+    assert client.get(api.url_for(AuthoritiesList), headers=token).json['total'] == count
+
+
 @pytest.mark.parametrize("token,status", [
-    (VALID_USER_HEADER_TOKEN, 404),
-    (VALID_ADMIN_HEADER_TOKEN, 404),
+    (VALID_USER_HEADER_TOKEN, 200),
+    (VALID_ADMIN_HEADER_TOKEN, 200),
     ('', 401)
 ])
 def test_authority_get(client, token, status):
@@ -64,8 +70,8 @@ def test_authority_post(client, token, status):
 
 
 @pytest.mark.parametrize("token,status", [
-    (VALID_USER_HEADER_TOKEN, 404),
-    (VALID_ADMIN_HEADER_TOKEN, 404),
+    (VALID_USER_HEADER_TOKEN, 400),
+    (VALID_ADMIN_HEADER_TOKEN, 400),
     ('', 401)
 ])
 def test_authority_put(client, token, status):

lemur/tests/test_domains.py

@@ -7,8 +7,8 @@ from .vectors import VALID_ADMIN_HEADER_TOKEN, VALID_USER_HEADER_TOKEN
 
 
 @pytest.mark.parametrize("token,status", [
-    (VALID_USER_HEADER_TOKEN, 404),
-    (VALID_ADMIN_HEADER_TOKEN, 404),
+    (VALID_USER_HEADER_TOKEN, 200),
+    (VALID_ADMIN_HEADER_TOKEN, 200),
     ('', 401)
 ])
 def test_domain_get(client, token, status):