Merge remote-tracking branch 'origin/master' into tagyourit

Conflicts:
	endpoints/api.py
	static/js/app.js
	static/partials/view-repo.html
	test/data/test.db
	test/specs.py
	test/test_api_usage.py

initdb.py

@@ -9,6 +9,7 @@ from peewee import (SqliteDatabase, create_model_tables, drop_model_tables,
 
 from data.database import *
 from data import model
+from data.model import oauth
 from app import app
 
 
@@ -182,6 +183,8 @@ def initialize_database():
   Visibility.create(name='private')
   LoginService.create(name='github')
   LoginService.create(name='quayrobot')
+
+  BuildTriggerService.create(name='github')
   
   LogEntryKind.create(name='account_change_plan')
   LogEntryKind.create(name='account_change_cc')
@@ -207,6 +210,7 @@ def initialize_database():
   LogEntryKind.create(name='add_repo_webhook')
   LogEntryKind.create(name='delete_repo_webhook')
   LogEntryKind.create(name='set_repo_description')
+
   LogEntryKind.create(name='build_dockerfile')
 
   LogEntryKind.create(name='org_create_team')
@@ -220,6 +224,19 @@ def initialize_database():
   LogEntryKind.create(name='modify_prototype_permission')
   LogEntryKind.create(name='delete_prototype_permission')
   
+  LogEntryKind.create(name='setup_repo_trigger')
+  LogEntryKind.create(name='delete_repo_trigger')
+
+  LogEntryKind.create(name='create_application')
+  LogEntryKind.create(name='update_application')
+  LogEntryKind.create(name='delete_application')
+  LogEntryKind.create(name='reset_application_client_secret')
+
+  NotificationKind.create(name='password_required')
+  NotificationKind.create(name='over_private_usage')
+
+  NotificationKind.create(name='test_notification')
+
 
 def wipe_database():
   logger.debug('Wiping all data from the DB.')
@@ -257,6 +274,9 @@ def populate_database():
   new_user_4.verified = True
   new_user_4.save()
 
+  new_user_5 = model.create_user('unverified', 'password', 'no5@thanks.com')
+  new_user_5.save()
+
   reader = model.create_user('reader', 'password', 'no1@thanks.com')
   reader.verified = True
   reader.save()
@@ -265,6 +285,8 @@ def populate_database():
   outside_org.verified = True
   outside_org.save()
 
+  model.create_notification('test_notification', new_user_1, metadata={'some': 'value'})
+
   __generate_repository(new_user_4, 'randomrepo', 'Random repo repository.', False,
                         [], (4, [], ['latest', 'prod']))
 
@@ -308,9 +330,24 @@ def populate_database():
                                    False, [], (0, [], None))
 
   token = model.create_access_token(building, 'write')
-  tag = 'ci.devtable.com:5000/%s/%s' % (building.namespace, building.name)
-  build = model.create_repository_build(building, token, '701dcc3724fb4f2ea6c31400528343cd',
-                                        tag, 'build-name')
+
+  trigger = model.create_build_trigger(building, 'github', '123authtoken',
+                                       new_user_1)
+  trigger.config = json.dumps({
+    'build_source': 'jakedt/testconnect',
+    'subdir': '',
+  })
+  trigger.save()
+
+  repo = 'ci.devtable.com:5000/%s/%s' % (building.namespace, building.name)
+  job_config = {
+    'repository': repo,
+    'docker_tags': ['latest'],
+    'build_subdir': '',
+  }
+  build = model.create_repository_build(building, token, job_config,
+                                        '701dcc3724fb4f2ea6c31400528343cd',
+                                        'build-name', trigger)
   build.uuid = 'deadbeef-dead-beef-dead-beefdeadbeef'
   build.save()
 
@@ -319,6 +356,15 @@ def populate_database():
   org.stripe_id = TEST_STRIPE_ID
   org.save()
 
+  oauth.create_application(org, 'Some Test App', 'http://localhost:8000', 'http://localhost:8000/o2c.html',
+                           client_id='deadbeef')
+
+  oauth.create_application(org, 'Some Other Test App', 'http://quay.io', 'http://localhost:8000/o2c.html',
+                           client_id='deadpork',
+                           description = 'This is another test application')
+
+  model.oauth.create_access_token_for_testing(new_user_1, 'deadbeef', 'repo:admin')
+
   model.create_robot('neworgrobot', org)
 
   owners = model.get_organization_team('buynlarge', 'owners')
@@ -423,6 +469,12 @@ def populate_database():
                    timestamp=today,
                    metadata={'token_code': 'somecode', 'repo': 'orgrepo'})
 
+  model.log_action('build_dockerfile', new_user_1.username, repository=building,
+                   timestamp=today,
+                   metadata={'repo': 'building', 'namespace': new_user_1.username,
+                             'trigger_id': trigger.uuid, 'config': json.loads(trigger.config),
+                             'service': trigger.service.name})
+
 if __name__ == '__main__':
   app.config['LOGGING_CONFIG']()
   initialize_database()