[Commits] [fluid-project/videoPlayer] 1289a5: FLUID-4787: Fixing multiple issues here. First fix...

Fri Oct 26 13:31:58 EDT 2012

  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/videoPlayer
  Commit: 1289a5d68147cc145eb7fc310b5167249550a27d
      https://github.com/fluid-project/videoPlayer/commit/1289a5d68147cc145eb7fc310b5167249550a27d
  Author: Alexey Novak <abovebluesky at gmail.com>
  Date:   2012-09-17 (Mon, 17 Sep 2012)

  Changed paths:
    M js/VideoPlayer_html5Captionator.js

  Log Message:
  -----------
  FLUID-4787: Fixing multiple issues here. First fixing a typo. Secondly now captions should be off be default. And lastly Safari will have default captions turned off be default.

  Commit: 1ad41273161d1d9f606175d8bdef7c1eea9e3109
      https://github.com/fluid-project/videoPlayer/commit/1ad41273161d1d9f606175d8bdef7c1eea9e3109
  Author: Alexey Novak <abovebluesky at gmail.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M tests/html/TestCaptions.en.vtt
    M tests/html/TestCaptions.fr.vtt
    M tests/html/VideoPlayerHTML5Captionator-test.html
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4787: Added tests to check that captions are not present in HTML when displayCaptions is set to false and also when some of the options are missing. Also revamped tests.

  Commit: ce41445fbfcffbecc630267d58fd9ef701bdadf9
      https://github.com/fluid-project/videoPlayer/commit/ce41445fbfcffbecc630267d58fd9ef701bdadf9
  Author: Alexey Novak <abovebluesky at gmail.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4787: Added a comment to show that some of the tests should be ran from localhost

  Commit: d27f74d04cb7005a2c3d1c3b29df1b4a2d98daa3
      https://github.com/fluid-project/videoPlayer/commit/d27f74d04cb7005a2c3d1c3b29df1b4a2d98daa3
  Author: Alexey Novak <abovebluesky at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M js/VideoPlayer.js
    M tests/html/VideoPlayer-test.html
    M tests/html/VideoPlayerHTML5Captionator-test.html
    M tests/js/TestUtils.js
    M tests/js/VideoPlayerControlsTests.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js
    M tests/js/VideoPlayerTests.js

  Log Message:
  -----------
  FLUID-4787: Fixed comments. Removed extra comments. Removed multiline vars and using single line ones instead. Put a setupEnvironment function into testUtils. Renamed html5 featore to be supportHtml5

  Commit: 348d8c3d9636d08b25a4bbf565e0280ce6657fc0
      https://github.com/fluid-project/videoPlayer/commit/348d8c3d9636d08b25a4bbf565e0280ce6657fc0
  Author: Alexey Novak <abovebluesky at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M tests/js/TestUtils.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4787: First steps towards interim step for creating a configurable test enviornment

  Commit: 5edf7ce5bef6c4d6723985f92f6b1690823ed914
      https://github.com/fluid-project/videoPlayer/commit/5edf7ce5bef6c4d6723985f92f6b1690823ed914
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M css/VideoPlayer.css
    M demos/Mammals.css
    M demos/VideoPlayer.html
    M demos/videos/ReorganizeFuture/ReorganizeFuture.en.vtt
    M demos/videos/ReorganizeFuture/ReorganizeFuture.fr.vtt
    M demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.en.json
    M demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.fr.json
    M html/videoPlayer_template.html
    M js/MenuButton.js
    M js/ToggleButton.js
    M js/VideoPlayer.js
    M js/VideoPlayer_controllers.js
    M js/VideoPlayer_html5Captionator.js
    M js/VideoPlayer_transcript.js
    M lib/captionator/README.txt
    M lib/captionator/js/captionator.js
    M lib/infusion/README.txt
    M tests/html/TestCaption.en.json
    M tests/html/TestCaptions.en.vtt
    M tests/html/TestCaptions.fr.vtt
    M tests/html/TestTranscripts.en.json
    M tests/html/TestTranscripts.fr.json
    A tests/html/VideoPlayerAria-Test.html
    M tests/html/VideoPlayerTranscript-test.html
    M tests/js/MenuButtonTests.js
    M tests/js/ToggleButtonTests.js
    A tests/js/VideoPlayerAriaTests.js
    M tests/js/VideoPlayerControlsTests.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js
    M tests/js/VideoPlayerIntegrationTests.js
    M tests/js/VideoPlayerTests.js
    M tests/js/VideoPlayerTranscriptTests.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4787

Conflicts:
	js/VideoPlayer_html5Captionator.js
	tests/html/TestCaptions.en.vtt
	tests/html/TestCaptions.fr.vtt
	tests/js/VideoPlayerHTML5CaptionatorTests.js

  Commit: 8aa21a295553faf09017430254ab8d109669caa3
      https://github.com/fluid-project/videoPlayer/commit/8aa21a295553faf09017430254ab8d109669caa3
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M tests/js/TestUtils.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4787: Clean up after merge conflict resolution.

  Commit: 958f0a02e5e6ee90f53a2da44e1be151df1786ff
      https://github.com/fluid-project/videoPlayer/commit/958f0a02e5e6ee90f53a2da44e1be151df1786ff
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    A tests/all-tests.html
    M tests/html/MenuButton-test.html
    M tests/html/ToggleButton-test.html
    M tests/html/VideoFramework-test.html
    M tests/html/VideoPlayer-IntegrationTest.html
    M tests/html/VideoPlayer-test.html
    M tests/html/VideoPlayerAria-Test.html
    M tests/html/VideoPlayerControls-test.html
    M tests/html/VideoPlayerHTML5Captionator-test.html
    M tests/html/VideoPlayerIntervalEventsConductor-integrationTest.html
    M tests/html/VideoPlayerIntervalEventsConductor-test.html
    M tests/html/VideoPlayerTranscript-test.html
    M tests/js/MenuButtonTests.js
    M tests/js/TestUtils.js
    M tests/js/ToggleButtonTests.js
    M tests/js/VideoFrameworkTests.js
    M tests/js/VideoPlayerAriaTests.js
    M tests/js/VideoPlayerControlsTests.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js
    M tests/js/VideoPlayerIntegrationTests.js
    M tests/js/VideoPlayerIntervalEventsConductorTests.js
    M tests/js/VideoPlayerTests.js
    M tests/js/VideoPlayerTranscriptTests.js
    M tests/lib/jqUnit/js/jqUnit.js
    M tests/lib/qunit/VERSION
    A tests/lib/qunit/addons/composite/README.md
    A tests/lib/qunit/addons/composite/index.html
    A tests/lib/qunit/addons/composite/qunit-composite.css
    A tests/lib/qunit/addons/composite/qunit-composite.js
    M tests/lib/qunit/css/qunit.css
    M tests/lib/qunit/js/qunit.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4787

Conflicts:
	tests/html/VideoPlayerHTML5Captionator-test.html
	tests/js/VideoPlayerControlsTests.js
	tests/js/VideoPlayerHTML5CaptionatorTests.js

Still a couple of tests failing.

  Commit: f5a4deed3be470d12d17cb5750bca8e29803103a
      https://github.com/fluid-project/videoPlayer/commit/f5a4deed3be470d12d17cb5750bca8e29803103a
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M js/VideoPlayer_html5Captionator.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4787: Fixing a merge bug and an unfortunately corresponding merge bug in the test.

  Commit: 610373f60d25fcb6fe740c0e6e80149c5e001032
      https://github.com/fluid-project/videoPlayer/commit/610373f60d25fcb6fe740c0e6e80149c5e001032
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M tests/js/TestUtils.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4787: Changing the naming and structure of the test utilities function which runs tests with an environment.

  Commit: e13e4ac5093ef180d2ba238fb02c5e9e7a105f5d
      https://github.com/fluid-project/videoPlayer/commit/e13e4ac5093ef180d2ba238fb02c5e9e7a105f5d
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-10-15 (Mon, 15 Oct 2012)

  Changed paths:
    M tests/js/TestUtils.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4787: Generalizing the implementation of setStaticEnv and cleanupEnv.

  Commit: a8a86914d9f8e9de3898ad5ab5d733c4367fc62a
      https://github.com/fluid-project/videoPlayer/commit/a8a86914d9f8e9de3898ad5ab5d733c4367fc62a
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    M tests/js/TestUtils.js
    M tests/js/VideoPlayerControlsTests.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js
    M tests/js/VideoPlayerTests.js

  Log Message:
  -----------
  FLUID-4787: Removing setupTestEnvironmentFeature in favour of setStaticEnv and cleanupEnv

  Commit: a89627789e6589ce085dda1967aa10fcba7f0465
      https://github.com/fluid-project/videoPlayer/commit/a89627789e6589ce085dda1967aa10fcba7f0465
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4787: Slight cleanup of the testInit function.

  Commit: ea68c27971d2a2172e122ada5e9c3a0c8980a0e3
      https://github.com/fluid-project/videoPlayer/commit/ea68c27971d2a2172e122ada5e9c3a0c8980a0e3
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M tests/js/TestUtils.js
    M tests/js/VideoPlayerControlsTests.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js
    M tests/js/VideoPlayerTests.js

  Log Message:
  -----------
  FLUID-4787: Renaming 'cleanupEnv' to 'clearStaticEnv' for consistency. Adding 'async' flag to testCaseWithEnv for individual tests.

  Commit: 18a8aa65e71f5b7f3ae339d0601e446af0ffbf1d
      https://github.com/fluid-project/videoPlayer/commit/18a8aa65e71f5b7f3ae339d0601e446af0ffbf1d
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-10-18 (Thu, 18 Oct 2012)

  Changed paths:
    M tests/js/TestUtils.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4787: Changing the testCaseWithEnv implementation so that setup and teardown use the same strategy.

  Commit: 2142c5799ccf54511e609a7adbca3217539eb869
      https://github.com/fluid-project/videoPlayer/commit/2142c5799ccf54511e609a7adbca3217539eb869
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M css/VideoPlayer.css
    A css/ltie9.css
    M demos/Mammals.html
    M demos/Mammals.js
    M demos/VideoPlayer.html
    M js/MenuButton.js
    M js/ToggleButton.js
    M js/VideoPlayer.js
    M js/VideoPlayer_controllers.js
    M js/VideoPlayer_framework.js
    M js/VideoPlayer_intervalEventsConductor.js
    M js/VideoPlayer_media.js
    M js/VideoPlayer_transcript.js
    A lib/html5shiv/js/html5shiv.js
    A lib/mediaelement/js/flashmediaelement.swf
    A lib/mediaelement/js/mediaelement.js
    A lib/mediaelement/js/mediaelement.min.js
    M tests/all-tests.html
    R tests/html/VideoPlayer-IntegrationTest.html
    M tests/html/VideoPlayer-test.html
    R tests/html/VideoPlayerAria-Test.html
    A tests/html/VideoPlayerAria-test.html
    M tests/html/VideoPlayerControls-test.html
    M tests/html/VideoPlayerHTML5Captionator-test.html
    A tests/html/VideoPlayerIntegration-test.html
    R tests/html/VideoPlayerIntervalEventsConductor-integrationTest.html
    A tests/html/VideoPlayerIntervalEventsConductorIntegration-test.html
    A tests/html/VideoPlayerTranscriptIntegration-test.html
    M tests/js/IntervalEventsConductor-IntegrationTests.js
    M tests/js/MenuButtonTests.js
    M tests/js/TestUtils.js
    M tests/js/ToggleButtonTests.js
    M tests/js/VideoFrameworkTests.js
    M tests/js/VideoPlayerAriaTests.js
    M tests/js/VideoPlayerControlsTests.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js
    M tests/js/VideoPlayerIntegrationTests.js
    M tests/js/VideoPlayerIntervalEventsConductorTests.js
    M tests/js/VideoPlayerTests.js
    A tests/js/VideoPlayerTranscriptIntegrationTests.js
    M tests/js/VideoPlayerTranscriptTests.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-4787

Conflicts:
	js/VideoPlayer.js
	tests/js/VideoPlayerHTML5CaptionatorTests.js

  Commit: 9916986c3d55c6f161d96610791350b10281741f
      https://github.com/fluid-project/videoPlayer/commit/9916986c3d55c6f161d96610791350b10281741f
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

  Changed paths:
    M js/VideoPlayer.js
    M tests/js/VideoPlayerTests.js

  Log Message:
  -----------
  FLUID-4787: Finish some of the refactoring.

  Commit: e7bb2a12a474b5d4e7b86b9d61fcd74f1be70373
      https://github.com/fluid-project/videoPlayer/commit/e7bb2a12a474b5d4e7b86b9d61fcd74f1be70373
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

  Changed paths:
    M demos/videos/ReorganizeFuture/ReorganizeFuture.en.vtt
    M js/VideoPlayer.js
    M tests/html/TestCaptions.en.vtt
    M tests/html/TestCaptions.fr.vtt
    M tests/html/VideoPlayer-test.html
    M tests/html/VideoPlayerHTML5Captionator-test.html
    M tests/js/TestUtils.js
    M tests/js/VideoPlayerControlsTests.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js
    M tests/js/VideoPlayerTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'acheetham/FLUID-4787'

* acheetham/FLUID-4787:
  FLUID-4787: Finish some of the refactoring.
  FLUID-4787: Changing the testCaseWithEnv implementation so that setup and teardown use the same strategy.
  FLUID-4787: Renaming 'cleanupEnv' to 'clearStaticEnv' for consistency. Adding 'async' flag to testCaseWithEnv for individual tests.
  FLUID-4787: Slight cleanup of the testInit function.
  FLUID-4787: Removing setupTestEnvironmentFeature in favour of setStaticEnv and cleanupEnv
  FLUID-4787: Generalizing the implementation of setStaticEnv and cleanupEnv.
  FLUID-4787: Changing the naming and structure of the test utilities function which runs tests with an environment.
  FLUID-4787: Fixing a merge bug and an unfortunately corresponding merge bug in the test.
  FLUID-4787: Clean up after merge conflict resolution.
  FLUID-4787: First steps towards interim step for creating a configurable test enviornment
  FLUID-4787: Fixed comments. Removed extra comments. Removed multiline vars and using single line ones instead. Put a setupEnvironment function into testUtils. Renamed html5 featore to be supportHtml5
  FLUID-4787: Added a comment to show that some of the tests should be ran from localhost
  FLUID-4787: Added tests to check that captions are not present in HTML when displayCaptions is set to false and also when some of the options are missing. Also revamped tests.
  FLUID-4787: Fixing multiple issues here. First fixing a typo. Secondly now captions should be off be default. And lastly Safari will have default captions turned off be default.

Compare: https://github.com/fluid-project/videoPlayer/compare/3b43848b5a77...e7bb2a12a474