Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@MarkPaxton
Copy link

Pull Request Checklist

  • Have you read How to write the perfect pull request?
  • Have you read through the contributor guidelines?
  • Have you signed the Lightbend CLA?
  • Have you [squashed your commits]? (Optional, but makes merge messages nicer.)
  • Have you added copyright headers to new files?
  • Have you checked that both Scala and Java APIs are updated?
  • Have you updated the documentation for both Scala and Java sections?
  • Have you added tests for any changed functionality?

Helpful things

Fixes

Fixes #6272

Purpose

This is a backport of the change in the 2.5.x branch to fix the issue as above

Background Context

This was suggested as part of issue #6592

References

#6592

@lightbend-cla-validator

Hi @MarkPaxton,

Thank you for your contribution! We really value the time you've taken to put this together.

Before we proceed with reviewing this pull request, please sign the Lightbend Contributors License Agreement:

http://www.lightbend.com/contribute/cla

@MarkPaxton MarkPaxton mentioned this pull request Sep 26, 2016
8 tasks
Copy link
Member

@gmethvin gmethvin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @MarkPaxton. Once you've fixed the build I think this is good.

@MarkPaxton
Copy link
Author

@gmethvin I'm not actually sure why the test suite fails as it doesn't appear to be against anything I changed - does the current test expect the 2.5.x branch only?

@gmethvin
Copy link
Member

It looks like we just added tests that used play.api.test.WithApplication in 2.5.x, so we added a dependency on play-specs2 (only in test): https://github.com/playframework/playframework/blob/2.5.x/framework/project/Build.scala#L373

If you add the play-specs2 dependency and import WithApplication it should work fine.

@MarkPaxton
Copy link
Author

@gmethvin It looks like the backport of the fix hasn't worked as now the new tests are failing

Copy link
Member

@mkurz mkurz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MarkPaxton Same here - you forgot to change a return statement. That's why your tests fail for this branch.

Get rid of the None() in Line 416 in Form.java and the tests should run fine.

@mkurz mkurz merged commit d036852 into playframework:2.4.x Dec 3, 2016
@mkurz mkurz added this to the 2.4.9 milestone Dec 6, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants