second commit

Makefile

@@ -19,11 +19,7 @@ dev:
 # Update requirements.txt
 .PHONY: requirements
 requirements:
-<<<<<<< 58ddae63f22bf2f54edd5143cbf322eef552066b
 	pip-compile --output-file requirements.txt requirements.in --upgrade
-=======
-	pip-compile --output-file requirements.txt requirements.in
->>>>>>> first commit
 
 # Install all packages in requirements.txt
 .PHONY: install-requirements
@@ -33,11 +29,7 @@ install-requirements:
 # Update test-requirements.txt
 .PHONY: test-requirements
 test-requirements:
-<<<<<<< 58ddae63f22bf2f54edd5143cbf322eef552066b
 	pip-compile --output-file test-requirements.txt test-requirements.in --upgrade
-=======
-	pip-compile --output-file test-requirements.txt test-requirements.in
->>>>>>> first commit
 
 # Install all packages in test-requirements.txt
 .PHONY: install-test-requirements

README.md

@@ -59,7 +59,6 @@ bounce start
 
 To check if your server is running navigate to [localhost:8080](http://localhost:8080/) in your browser. You should see see `Bounce API accepting requests!`. Note that this project directory is mounted to `/opt/bounce` in the `web` development container, so any edits you make to it should be immediately available in the container - no need to rebuild or restart it while developing!
 
-<<<<<<< 58ddae63f22bf2f54edd5143cbf322eef552066b
 ### Ubuntu 16.04
 
 Some packages such as aiohttp > 3.0.0 won't be found in python 3.5's virtualenv. So you can do the following:
@@ -70,8 +69,6 @@ pip3 install package-name
 deactivate # to exit the virtualenv
 ```
 
-=======
->>>>>>> first commit
 ## Development
 
 ### Packaging

bounce/cli.py

@@ -8,10 +8,7 @@
 from sanic.log import logger
 
 from .server import Server
-<<<<<<< 58ddae63f22bf2f54edd5143cbf322eef552066b
-=======
 from .server.api.clubs import ClubEndpoint, ClubsEndpoint
->>>>>>> first commit
 from .server.api.users import UserEndpoint, UsersEndpoint
 from .server.config import ServerConfig
 
@@ -65,10 +62,6 @@ def start(port, pg_host, pg_port, pg_user, pg_password, pg_database, loglevel):
     conf = ServerConfig(port, pg_host, pg_port, pg_user, pg_password,
                         pg_database)
     # Register your new endpoints here
-<<<<<<< 58ddae63f22bf2f54edd5143cbf322eef552066b
-    endpoints = [UsersEndpoint, UserEndpoint]
-=======
     endpoints = [UsersEndpoint, UserEndpoint, ClubsEndpoint, ClubEndpoint]
->>>>>>> first commit
     serv = Server(conf, endpoints)
     serv.start()

bounce/db/club.py

@@ -35,8 +35,6 @@ def to_dict(self):
             'twitter_url': self.twitter_url,
             'created_at': self.created_at,
         }
-<<<<<<< 58ddae63f22bf2f54edd5143cbf322eef552066b
-=======
 
 
 def select(session, name):
@@ -87,4 +85,3 @@ def delete(session, name):
     """Deletes the club with the given name."""
     session.query(Club).filter(Club.name == name).delete()
     session.commit()
->>>>>>> first commit

tests/test_api.py

@@ -7,10 +7,6 @@ def test_root_handler(server):
     _, response = server.app.test_client.get('/')
     assert response.status == 200
     assert response.body == b'Bounce API accepting requests!'
-<<<<<<< 58ddae63f22bf2f54edd5143cbf322eef552066b
-=======
-    print(_)
->>>>>>> first commit
 
 
 def test_post_users__success(server):
@@ -76,8 +72,6 @@ def test_get_user__failure(server):
 def test_delete_user__success(server):
     _, response = server.app.test_client.delete('/users/test')
     assert response.status == 204
-<<<<<<< 58ddae63f22bf2f54edd5143cbf322eef552066b
-=======
 
 def test_post_clubs__success(server):
     _, response = server.app.test_client.post(
@@ -91,4 +85,58 @@ def test_post_clubs__success(server):
             'twitter_url': 'twitter.com/test',
         }))
     assert response.status == 201
->>>>>>> first commit
+
+def test_post_clubs__failure(server):
+    _, response = server.app.test_client.post(
+        '/clubs',
+        data=json.dumps({
+            'name': 'test',
+            'description': 'club called test',
+            'website_url': 'club.com',
+            'facebook_url': 'facebook.com/test',
+            'instagram_url': 'instagram.com/test',
+            'twitter_url': 'twitter.com/test',
+        }))
+    assert response.status == 400
+    assert 'error' in response.json
+
+
+def test_put_club__success(server):
+    _, response = server.app.test_client.put(
+        '/clubs/test',
+        data=json.dumps({
+            'name': 'new test',
+            'description': 'club called new test',
+        }))
+    assert response.status == 200
+    assert response.json['name'] == 'test'
+    assert response.json['id'] == 1
+    assert isinstance(response.json['created_at'], int)
+
+
+def test_put_club__failure(server):
+    _, response = server.app.test_client.put(
+        '/clubs/test', data=json.dumps({
+            'garbage': True
+        }))
+    assert response.status == 400
+
+
+def test_get_club__success(server):
+    _, response = server.app.test_client.get('/clubs/test')
+    assert response.status == 200
+    assert response.json['username'] == 'test'
+    assert response.json['full_name'] == 'New Name'
+    assert response.json['email'] == 'newemail@test.com'
+    assert response.json['id'] == 1
+    assert isinstance(response.json['created_at'], int)
+
+
+def test_get_club__failure(server):
+    _, response = server.app.test_client.get('/clubs/doesnotexist')
+    assert response.status == 404
+
+
+def test_delete_club__success(server):
+    _, response = server.app.test_client.delete('/clubs/test')
+    assert response.status == 204