renaming progress to currentTime

Author: mattjburrows

app/actions/setCurrentTime.js

@@ -0,0 +1,10 @@
+'use strict';
+
+export const SET_CURRENT_TIME = 'SET_CURRENT_TIME';
+
+export function setCurrentTime(currentTime) {
+  return {
+    type: SET_CURRENT_TIME,
+    currentTime: currentTime
+  };
+}

app/actions/setProgress.js

@@ -3,14 +3,14 @@
 import { IS_PLAYING } from '../actions/isPlaying';
 import { HAS_STOPPED } from '../actions/hasStopped';
 import { SET_VOLUME } from '../actions/setVolume';
-import { SET_PROGRESS } from '../actions/setProgress';
+import { SET_CURRENT_TIME } from '../actions/setCurrentTime';
 import { SET_DURATION } from '../actions/setDuration';
 
 const initialState = {
   isPlaying: false,
   hasStopped: true,
   volume: 50,
-  progress: 0,
+  currentTime: 0,
   duration: 0
 };
 
@@ -44,9 +44,9 @@ function setVolumeState(volume) {
   };
 }
 
-function setProgressState(progress) {
+function setCurrentTimeState(currentTime) {
   return {
-    progress: progress
+    currentTime: currentTime
   };
 }
 
@@ -64,8 +64,8 @@ export function playbackReducer(state = initialState, action) {
       return Object.assign({}, state, setHasStoppedState(action.hasStopped));
     case SET_VOLUME :
       return Object.assign({}, state, setVolumeState(action.volume));
-    case SET_PROGRESS :
-      return Object.assign({}, state, setProgressState(action.progress));
+    case SET_CURRENT_TIME :
+      return Object.assign({}, state, setCurrentTimeState(action.currentTime));
     case SET_DURATION :
       return Object.assign({}, state, setDurationState(action.duration));
     default:

app/reducers/playback.js

@@ -1,7 +1,7 @@
 'use strict';
 
 import { hasStopped } from '../actions/hasStopped';
-import { setProgress } from '../actions/setProgress';
+import { setCurrentTime } from '../actions/setCurrentTime';
 import { setDuration } from '../actions/setDuration';
 
 function setupPlayer(player) {
@@ -26,7 +26,7 @@ function setupDispatch(store, player) {
   store.dispatch(setDuration(player.duration));
 
   player.addEventListener('ended', () => store.dispatch(hasStopped(true)));
-  player.addEventListener('timeupdate', () => store.dispatch(setProgress(player.currentTime)));
+  player.addEventListener('timeupdate', () => store.dispatch(setCurrentTime(player.currentTime)));
 }
 
 function isPlayingChanged(previousState, currentState) {

app/store/mapStoreToPlayer.js

@@ -0,0 +1,13 @@
+'use strict';
+
+import assert from 'assert';
+import { SET_CURRENT_TIME, setCurrentTime } from '../../app/actions/setCurrentTime';
+
+describe('setCurrentTime', () => {
+  it('returns an object with the currentTime: {NUMBER}', () => {
+    const action = setCurrentTime(50);
+
+    assert.equal(action.type, SET_CURRENT_TIME);
+    assert.equal(action.currentTime, 50);
+  });
+});

test/actions/setCurrentTime.js

@@ -4,7 +4,7 @@ import assert from 'assert';
 import { IS_PLAYING } from '../../app/actions/isPlaying';
 import { HAS_STOPPED } from '../../app/actions/hasStopped';
 import { SET_VOLUME } from '../../app/actions/setVolume';
-import { SET_PROGRESS } from '../../app/actions/setProgress';
+import { SET_CURRENT_TIME } from '../../app/actions/setCurrentTime';
 import { SET_DURATION } from '../../app/actions/setDuration';
 import { playbackReducer } from '../../app/reducers/playback';
 
@@ -74,18 +74,18 @@ describe('playbackState', () => {
     });
   });
 
-  describe('progress property', () => {
+  describe('currentTime property', () => {
     it('defaults to 0', () => {
-      assert.strictEqual(playbackReducer(undefined, '').progress, 0);
+      assert.strictEqual(playbackReducer(undefined, '').currentTime, 0);
     });
 
-    it('sets {progress: 75} when action.progress is 75', () => {
+    it('sets {currentTime: 75} when action.currentTime is 75', () => {
       const state = playbackReducer(undefined, {
-        type: SET_PROGRESS,
-        progress: 75
+        type: SET_CURRENT_TIME,
+        currentTime: 75
       });
 
-      assert.strictEqual(state.progress, 75);
+      assert.strictEqual(state.currentTime, 75);
     });
   });
 

test/actions/setProgress.js

@@ -7,7 +7,7 @@ import _ from 'lodash';
 import configureStore from '../../app/store/configurePlayerStore';
 import mapStoreToPlayer from '../../app/store/mapStoreToPlayer';
 import { HAS_STOPPED } from '../../app/actions/hasStopped';
-import { SET_PROGRESS } from '../../app/actions/setProgress';
+import { SET_CURRENT_TIME } from '../../app/actions/setCurrentTime';
 import { SET_DURATION } from '../../app/actions/setDuration';
 
 const store = configureStore();
@@ -140,14 +140,14 @@ describe('mapStoreToPlayer', () => {
       unsubscribe();
     });
 
-    it('dispatched SET_PROGRESS: {NUMBER} when the timeupdate event is triggered', () => {
+    it('dispatched SET_CURRENT_TIME: {NUMBER} when the timeupdate event is triggered', () => {
       const player = setupPlayer({
         currentTime: 75
       });
       const unsubscribe = mapStoreToPlayer(store, player);
       const expectedCallArgs = {
-        type: SET_PROGRESS,
-        progress: 75
+        type: SET_CURRENT_TIME,
+        currentTime: 75
       };
 
       player.timeupdate();