Merge pull request #39 from m3brown/circular-hell

Address import issue between gh and moirai workers

spec/workers/moiraiSpec.coffee

@@ -214,7 +214,7 @@ describe 'handleAddData', () ->
     this.event = {data: {publicKeys: ['key']}}
     this.user = {name: 'user_name'}
 
-  xit 'calls get_all_team_roles_for_user', (done) ->
+  it 'calls get_all_team_roles_for_user', (done) ->
     handleAddData = moirai.handlers.user['d+']
     handleAddData(this.event, this.user).then((resp) ->
       expect(teams.get_all_team_roles_for_user.calls.length).toEqual(1)
@@ -223,7 +223,7 @@ describe 'handleAddData', () ->
       done()
     ).catch(onError)
 
-  xit 'calls setTeamKeys', (done) ->
+  it 'calls setTeamKeys', (done) ->
     handleAddData = moirai.handlers.user['d+']
     handleAddData(this.event, this.user).then((resp) ->
       expect(moirai.testing.setTeamKeys.calls.length).toEqual(2)

src/workers/gh.coffee

@@ -3,7 +3,6 @@ users = require('../api/users')
 auth = require('../validation').auth
 git = require('./gh_client')
 Promise = require('pantheon-helpers').promise
-teams_api = require('../api/teams')
 
 gh = {}
 
@@ -107,6 +106,7 @@ handle_create_team = (event, team) ->
   )
 
 get_gh_team_ids = (user) ->
+  teams_api = require('../api/teams')
   teams_api.get_all_team_roles_for_user(user.name).then((team_roles) ->
     gh_team_ids = team_roles.map((team_role) ->
       return get_gh_team_id(team_role.team, user, team_role.role)

src/workers/moirai.coffee

@@ -1,6 +1,5 @@
 _ = require('underscore')
 users = require('../api/users')
-teams = require('../api/teams')
 auth = require('../validation').auth
 Promise = require('pantheon-helpers/lib/promise')
 conf = require('../config')
@@ -69,6 +68,7 @@ handleAddCluster = (event, team) ->
 handleAddData = (event, user) ->
   # look at the event, see if one of the keys in the event is publicKeys
   if event.data.publicKeys?
+    teams = require('../api/teams')
     return teams.get_all_team_roles_for_user(user.name).then((teamList) ->
       teamPromises = teamList.map((teamHash) ->
         team = teamHash.team