Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Additions for PR https://github.com/playframework/play1/pull/1246 #1248

Merged
merged 14 commits into from
Jul 31, 2018
Merged

Additions for PR https://github.com/playframework/play1/pull/1246 #1248

merged 14 commits into from
Jul 31, 2018

Commits on Dec 25, 2015

  1. [#1849] Made an unrelated test a little bit more robust against timin… 

    …g issues
    @xael-fry
    Hendrik Schnepel authored and xael-fry committed Dec 25, 2015
    Configuration menu
    Copy the full SHA
    139e2fa View commit details
    Browse the repository at this point in the history

  2. [#1849] Added test cases that show the unexpected behavior

    @xael-fry
    Hendrik Schnepel authored and xael-fry committed Dec 25, 2015
    Configuration menu
    Copy the full SHA
    29c7e3f View commit details
    Browse the repository at this point in the history

  3. [#1849] Adapted BinaryTest to reflect corrected expectations

    @xael-fry
    Hendrik Schnepel authored and xael-fry committed Dec 25, 2015
    Configuration menu
    Copy the full SHA
    ea60d35 View commit details
    Browse the repository at this point in the history

  4. [#1849] Fixed that exceptions from controllers are being ignored

    @xael-fry
    Hendrik Schnepel authored and xael-fry committed Dec 25, 2015
    Configuration menu
    Copy the full SHA
    f5419be View commit details
    Browse the repository at this point in the history

  5. [#1849] Give tests more fine grained control over what exceptions the… 

    …y expect
    @xael-fry
    Hendrik Schnepel authored and xael-fry committed Dec 25, 2015
    Configuration menu
    Copy the full SHA
    0dfbbfb View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2018

  1. Merge branch 'master' into 1849_controllerException 

    # Conflicts:
#	framework/src/play/test/FunctionalTest.java
#	samples-and-tests/just-test-cases/conf/routes
#	samples-and-tests/just-test-cases/test/FunctionalTestTest.java
    @LouisJackman
    LouisJackman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    27db29e View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2018

  1. Resolved merge conflict

    @Fraserhardy
    Fraserhardy committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    b41ebc3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from playframework/master 

    Update qudini/play1 master
    @Fraserhardy
    Fraserhardy authored Jul 18, 2018
    Configuration menu
    Copy the full SHA
    2637d90 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into 1849_controllerException 

    * master:
  [playframework#1244] doc(release): add documentation for 1.5.1
  [#1896] fix play daemon stacktrace on [re]start-stop
    @Fraserhardy
    Fraserhardy committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    97c3ebc View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2018

  1. Fixed issue with Transactional Tests 

    Fixed issue with Static test
    @Fraserhardy
    Fraserhardy committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    28b06cd View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2018

  1. Merge branch '1849_controllerException' of https://github.com/qudini/… 

    …play1 into qudini-1849_controllerException
    @asolntsev
    asolntsev committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    05ff024 View commit details
    Browse the repository at this point in the history

  2. #1849 add method assertIsStaticFile() and special case allowing to te… 

    …st RenderStatic in functional tests

P.S. it implements my comments for PR playframework#1246
    @asolntsev
    asolntsev committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    77a2c40 View commit details
    Browse the repository at this point in the history

  3. #1849 improve design of BinaryTest 

    P.S. it implements my comments for PR playframework#1246
    @asolntsev
    asolntsev committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    c54f2e6 View commit details
    Browse the repository at this point in the history

  4. #1849 restore checks in TransactionalJPATest that were accidentally d… 

    …eleted in PR 1246

P.S. it implements my comments for PR playframework#1246
    @asolntsev
    asolntsev committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    29319dd View commit details
    Browse the repository at this point in the history