DerbyBoutTime · thephw · Jun 10, 2015 · May 27, 2015 · May 27, 2015 · May 28, 2015
diff --git a/app/index.html b/app/index.html
@@ -8,11 +8,6 @@
   </head>
   <body>
     <section id="react"></section>
-    <script src="bower_components/jquery/dist/jquery.min.js"></script>
-    <script src="bower_components/jquery-minicolors/jquery.minicolors.min.js"></script>
-    <script src="bower_components/bootstrap-sass/assets/javascripts/bootstrap.min.js"></script>
-    <script src="bower_components/moment/min/moment.min.js"></script>
-    <script src="bower_components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
     <script src="scripts/app.js"></script>
   </body>
 </html>
diff --git a/app/scripts/__mocks__/clock.coffee b/app/scripts/__mocks__/clock.coffee
@@ -0,0 +1,6 @@
+clockMock = jest.genMockFromModule('../clock')
+clockMock.ClockManager.prototype.getOrAddClock.mockImplementation () ->
+  new clockMock.Clock()
+clockMock.ClockManager.prototype.addClock.mockImplementation () ->
+  new clockMock.Clock()
+module.exports = clockMock
diff --git a/app/scripts/app.cjsx b/app/scripts/app.cjsx
@@ -1,3 +1,5 @@
+$ = require 'jquery'
+require 'bootstrap'
 React = require 'react'
 GamePicker = require './components/game_picker.cjsx'
 React.render <GamePicker />, document.getElementById('react')
diff --git a/app/scripts/components/announcers_feed.cjsx b/app/scripts/components/announcers_feed.cjsx
@@ -1,4 +1,5 @@
 React = require 'react/addons'
+$ = require 'jquery'
 cx = React.addons.classSet
 module.exports = React.createClass
   componentDidMount: () ->

diff --git a/app/scripts/components/game.cjsx b/app/scripts/components/game.cjsx
@@ -1,4 +1,5 @@
 React = require 'react/addons'
+$ = require 'jquery'
 constants = require '../constants.coffee'
 functions = require '../functions.coffee'
 Titlebar = require './titlebar.cjsx'

diff --git a/app/scripts/components/game_notes.cjsx b/app/scripts/components/game_notes.cjsx
@@ -1,4 +1,5 @@
 React = require 'react/addons'
+$ = require 'jquery'
 cx = React.addons.classSet
 module.exports = React.createClass
   componentDidMount: () ->

diff --git a/app/scripts/components/game_setup.cjsx b/app/scripts/components/game_setup.cjsx
@@ -1,4 +1,5 @@
 React = require 'react/addons'
+$ = require 'jquery'
 GameForm = require './game_setup/game_form'
 Skater = require '../models/skater'
 AppDispatcher = require '../dispatcher/app_dispatcher'

diff --git a/app/scripts/components/game_setup/game_form.cjsx b/app/scripts/components/game_setup/game_form.cjsx
@@ -1,4 +1,6 @@
 React = require 'react/addons'
+$ = require 'jquery'
+require 'bootstrap-datetimepicker'
 moment = require 'moment'
 TeamFields = require './team_fields'
 cx = React.addons.classSet

diff --git a/app/scripts/components/game_setup/team_fields.cjsx b/app/scripts/components/game_setup/team_fields.cjsx
@@ -1,4 +1,6 @@
 React = require 'react/addons'
+$ = require 'jquery'
+require 'jquery-minicolors'
 RosterFields = require './roster_fields'
 cx = React.addons.classSet
 module.exports = React.createClass

diff --git a/app/scripts/components/jam_timer.cjsx b/app/scripts/components/jam_timer.cjsx
@@ -1,4 +1,5 @@
 React = require 'react/addons'
+$ = require 'jquery'
 AppDispatcher = require '../dispatcher/app_dispatcher.coffee'
 constants = require '../constants.coffee'
 {ActionTypes} = require '../constants.coffee'

diff --git a/app/scripts/components/navbar.cjsx b/app/scripts/components/navbar.cjsx
@@ -1,4 +1,5 @@
 React = require 'react/addons'
+$ = require 'jquery'
 cx = React.addons.classSet
 module.exports = React.createClass
   buildOptions: (opts = {}) ->

diff --git a/app/scripts/components/penalty_tracker/edit_penalty_panel.cjsx b/app/scripts/components/penalty_tracker/edit_penalty_panel.cjsx
@@ -1,4 +1,5 @@
 React = require 'react/addons'
+$ = require 'jquery'
 AppDispatcher = require '../../dispatcher/app_dispatcher.coffee'
 {ActionTypes} = require '../../constants.coffee'
 cx = React.addons.classSet

diff --git a/app/scripts/components/penalty_tracker/team_penalties.cjsx b/app/scripts/components/penalty_tracker/team_penalties.cjsx
@@ -1,4 +1,5 @@
 React = require 'react/addons'
+$ = require 'jquery'
 AppDispatcher = require '../../dispatcher/app_dispatcher.coffee'
 {ActionTypes} = require '../../constants.coffee'
 PenaltiesSummary = require './penalties_summary.cjsx'

diff --git a/app/scripts/components/scoreboard.cjsx b/app/scripts/components/scoreboard.cjsx
@@ -1,7 +1,5 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/
 React = require 'react/addons'
+$ = require 'jquery'
 Jam = require '../models/jam.coffee'
 ScoreboardClocks = require './scoreboard/scoreboard_clocks.cjsx'
 cx = React.addons.classSet
@@ -15,6 +13,14 @@ module.exports = React.createClass
       homeJamPoints = homeJam.getPoints()
     if awayJam
       awayJamPoints = awayJam.getPoints()
+    periodNumber = switch @props.gameState.period
+      when 'period 1' then '1'
+      when 'period 2' then '2'
+      when 'pregame' then 'Pre'
+      when 'halftime' then 'Half'
+      when 'unofficial final' then 'UF'
+      when 'official final' then 'OF'
+      else ''
     adsCS = cx
       'ads': true
       'hidden': $.inArray(@props.gameState.state, ["timeout"]) == -1
@@ -144,7 +150,7 @@ module.exports = React.createClass
             <div className="period">
               <label className="hidden-xs">Period</label>
               <label className="visible-xs-block">Per</label>
-              <div className="number period-number">{@props.gameState.periodNumber}</div>
+              <div className="number period-number">{periodNumber}</div>
             </div>
             <div className="jam">
               <label>Jam</label>

diff --git a/app/scripts/components/scorekeeper/jams_list.cjsx b/app/scripts/components/scorekeeper/jams_list.cjsx
@@ -1,4 +1,5 @@
 React = require 'react/addons'
+$ = require 'jquery'
 AppDispatcher = require '../../dispatcher/app_dispatcher.coffee'
 {ActionTypes} = require '../../constants.coffee'
 functions = require '../../functions.coffee'

diff --git a/app/scripts/components/scorekeeper/pass_edit_panel.cjsx b/app/scripts/components/scorekeeper/pass_edit_panel.cjsx
@@ -1,4 +1,5 @@
 React = require 'react/addons'
+$ = require 'jquery'
 AppDispatcher = require '../../dispatcher/app_dispatcher.coffee'
 {ActionTypes} = require '../../constants.coffee'
 functions = require '../../functions.coffee'

diff --git a/app/scripts/components/scorekeeper/pass_item.cjsx b/app/scripts/components/scorekeeper/pass_item.cjsx
@@ -1,4 +1,5 @@
 React = require 'react/addons'
+$ = require 'jquery'
 functions = require '../../functions.coffee'
 AppDispatcher = require '../../dispatcher/app_dispatcher.coffee'
 {ActionTypes} = require '../../constants.coffee'

diff --git a/app/scripts/components/scorekeeper/passes_list.cjsx b/app/scripts/components/scorekeeper/passes_list.cjsx
@@ -1,4 +1,5 @@
 React = require 'react/addons'
+$ = require 'jquery'
 AppDispatcher = require '../../dispatcher/app_dispatcher.coffee'
 {ActionTypes} = require '../../constants.coffee'
 PassItem = require './pass_item.cjsx'

diff --git a/app/scripts/dispatcher/app_dispatcher.coffee b/app/scripts/dispatcher/app_dispatcher.coffee
@@ -9,7 +9,6 @@ class AppDispatcher
     @delays = []
     @delay
     @socket = IO(config.get('socketUrl'))
-    console.log "Socket opened on #{@socket.io.uri}"
     @socket.on 'app dispatcher', (payload) =>
       @dispatch(payload)
     @socket.on 'sync games', (payload) =>

diff --git a/app/scripts/models/__mocks__/jam.coffee b/app/scripts/models/__mocks__/jam.coffee
@@ -0,0 +1,4 @@
+jamMock = jest.genMockFromModule('../jam')
+jamMock.findBy.mockReturnValue([])
+jamMock.prototype.getPositionsInBox.mockReturnValue([])
+module.exports = jamMock
diff --git a/app/scripts/models/__mocks__/pass.coffee b/app/scripts/models/__mocks__/pass.coffee
@@ -0,0 +1,5 @@
+passMock = jest.genMockFromModule('../pass')
+passMock.find.mockImplementation (id) ->
+  id
+passMock.findBy.mockReturnValue([])
+module.exports = passMock
diff --git a/app/scripts/models/__mocks__/skater.coffee b/app/scripts/models/__mocks__/skater.coffee
@@ -0,0 +1,5 @@
+skaterMock = jest.genMockFromModule('../skater')
+skaterMock.find.mockImplementation (id) ->
+  id
+skaterMock.findBy.mockReturnValue ([])
+module.exports = skaterMock
diff --git a/app/scripts/models/game_state.coffee b/app/scripts/models/game_state.coffee
@@ -1,4 +1,5 @@
 moment = require 'moment'
+$ = require 'jquery'
 _ = require 'underscore'
 functions = require '../functions'
 AppDispatcher = require '../dispatcher/app_dispatcher'
@@ -95,6 +96,8 @@ class GameState extends Store
         new GameState(obj).save() for obj in action.games
     game.save() if game?
     @emitChange()
+    #return instance operated on for testing
+    game
   constructor: (options={}) ->
     super options
     @name = options.name
@@ -160,13 +163,9 @@ class GameState extends Store
     @advancePeriod()
     @periodClock.start()
     @state = "jam"
-    @home.jamPoints = 0
-    @away.jamPoints = 0
     @jamNumber = @jamNumber + 1
-    for i in [@away.jams.length+1 .. @jamNumber] by 1
-      @away.createNextJam()
-    for i in [@home.jams.length+1 .. @jamNumber] by 1
-      @home.createNextJam()
+    @home.createJamsThrough @jamNumber
+    @away.createJamsThrough @jamNumber
   stopJam: () =>
     @jamClock.stop()
     @startLineup()
@@ -210,9 +209,7 @@ class GameState extends Store
       @startTimeout()
     @_clearTimeouts()
     @timeout = "home_team_timeout"
-    @home.timeouts = @home.timeouts - 1
-    @home.isTakingTimeout = true
-    console.log "timeouts=#{@home.timeouts}"
+    @home.startTimeout()
   setTimeoutAsHomeTeamOfficialReview: () =>
     if @_inTimeout() == false
       @startTimeout()
@@ -226,9 +223,7 @@ class GameState extends Store
     @_clearTimeouts()
     @state = "timeout"
     @timeout = "away_team_timeout"
-    @away.timeouts = @away.timeouts - 1
-    @away.isTakingTimeout = true
-    console.log "timeouts=#{@away.timeouts}"
+    @away.startTimeout()
   setTimeoutAsAwayTeamOfficialReview: () =>
     if @_inTimeout() == false
       @startTimeout()
@@ -255,19 +250,15 @@ class GameState extends Store
   setJamNumber: (val) =>
     @jamNumber = parseInt(val)
   removeHomeTeamOfficialReview: () =>
-    @home.hasOfficialReview = false
-    @home.officialReviewsRetained = @home.officialReviewsRetained - 1
+    @home.removeOfficialReview()
   removeAwayTeamOfficialReview: () =>
-    @away.hasOfficialReview = false
-    @away.officialReviewsRetained = @away.officialReviewsRetained - 1
+    @away.removeOfficialReview()
   restoreHomeTeamOfficialReview: () =>
-    @home.hasOfficialReview = true
     @_clearTimeouts()
-    @home.officialReviewsRetained = @home.officialReviewsRetained + 1
-  restoreAwayTeamOfficialReview: (retained = false) =>
-    @away.hasOfficialReview = true
+    @home.restoreOfficialReview()
+  restoreAwayTeamOfficialReview: () =>
     @_clearTimeouts()
-    @away.officialReviewsRetained = @away.officialReviewsRetained + 1
+    @away.restoreOfficialReview()
   _inTimeout: ()->
       @state == "timeout"
   _clearAlerts: () =>

diff --git a/app/scripts/models/jam.coffee b/app/scripts/models/jam.coffee
@@ -12,57 +12,67 @@ class Jam extends Store
         jam.toggleNoPivot()
         jam.save()
         @emitChange()
+        return jam
       when ActionTypes.TOGGLE_STAR_PASS
         jam = @find(action.jamId)
         jam.toggleStarPass()
         jam.save()
         @emitChange()
+        return jam
       when ActionTypes.SET_STAR_PASS
         pass = Pass.find(action.passId)
         jam = Jam.find(pass.jamId)
         jam.setStarPass(pass)
         jam.createNextPass(action.newPassId) if pass.id is jam.getLastPass().id
         jam.save()
         @emitChange()
+        return jam
       when ActionTypes.SET_SKATER_POSITION
         jam = @find(action.jamId)
         jam.setSkaterPosition(action.position, action.skaterId)
         jam.save()
         @emitChange()
+        return jam
       when ActionTypes.CYCLE_LINEUP_STATUS
         jam = @find(action.jamId)
         jam.cycleLineupStatus(action.statusIndex, action.position)
         jam.save()
         @emitChange()
+        return jam
       when ActionTypes.TOGGLE_LEAD
         AppDispatcher.waitFor([Pass.dispatchToken])
         pass = Pass.find(action.passId)
         jam = Jam.find(pass.jamId)
         jam.createNextPass(action.newPassId) if pass.id is jam.getLastPass().id
         jam.save()
         @emitChange()
+        return jam
       when ActionTypes.SET_POINTS
         AppDispatcher.waitFor([Pass.dispatchToken])
         pass = Pass.find(action.passId)
         jam = Jam.find(pass.jamId)
         jam.createNextPass(action.newPassId) if pass.id is jam.getLastPass().id
         jam.save()
         @emitChange()
+        return jam
       when ActionTypes.REORDER_PASS
         jam = @find(action.jamId)
         jam.reorderPass(action.sourcePassIndex, action.targetPassIndex)
         jam.save()
         @emitChange()
+        return jam
       when ActionTypes.SET_PASS_JAMMER
         AppDispatcher.waitFor([Pass.dispatchToken])
         pass = Pass.find(action.passId)
         jam = Jam.find(pass.jamId)
         if not jam.jammer?
           jam.setSkaterPosition('jammer', action.skaterId)
+        return jam
       when ActionTypes.SAVE_JAM
         jam = new Jam(action.jam)
         jam.save()
         @emitChange()
+        return jam
   constructor: (options={}) ->
     super options
     @teamId = options.teamId
@@ -110,10 +120,8 @@ class Jam extends Store
     Object.keys(flags).filter (key) ->
       flags[key]
   toggleNoPivot: () ->
-    console.log "toggling no pivot #{@id}"
     @noPivot = not @noPivot
   toggleStarPass: () ->
-    console.log "toggling star pass #{@id}"
     @starPass = not @starPass
   setStarPass: (pass) ->
     @starPass = not @starPass or @starPassNumber isnt pass.passNumber
@@ -141,7 +149,6 @@ class Jam extends Store
     currentStatus = @lineupStatuses[statusIndex][position]
     @lineupStatuses[statusIndex][position] = @statusTransition(currentStatus)
   createNextPass: (passId) ->
-    console.log ("Creating new pass with id #{passId}")
     lastPass = @getLastPass()
     newPass = new Pass(id: passId, passNumber: lastPass.passNumber + 1, jamId: @id)
     @passes.push newPass

diff --git a/app/scripts/models/pass.coffee b/app/scripts/models/pass.coffee
@@ -11,41 +11,49 @@ class Pass extends Store
         pass.toggleInjury()
         pass.save()
         @emitChange()
+        return pass
       when ActionTypes.TOGGLE_NOPASS
         pass = @find(action.passId)
         pass.toggleNopass()
         pass.save()
         @emitChange()
+        return pass
       when ActionTypes.TOGGLE_CALLOFF
         pass = @find(action.passId)
         pass.toggleCalloff()
         pass.save()
         @emitChange()
+        return pass
       when ActionTypes.TOGGLE_LOST_LEAD
         pass = @find(action.passId)
         pass.toggleLostLead()
         pass.save()
         @emitChange()
+        return pass
       when ActionTypes.TOGGLE_LEAD
         pass = @find(action.passId)
         pass.toggleLead()
         pass.save()
         @emitChange()
+        return pass
       when ActionTypes.SET_STAR_PASS
         pass = @find(action.passId)
         pass.setPoints(0)
         pass.save()
         @emitChange()
+        return pass
       when ActionTypes.SET_POINTS
         pass = @find(action.passId)
         pass.setPoints(action.points)
         pass.save()
         @emitChange()
+        return pass
       when ActionTypes.SET_PASS_JAMMER
         pass = @find(action.passId)
         pass.setJammer(action.skaterId)
         pass.save()
         @emitChange()
+        return pass
   constructor: (options={}) ->
     super options
     @jamId = options.jamId