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.

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

Allow markTestSkipped/Incomplete() in dataProvider #997

Merged

Conversation

dshafik
Copy link
Contributor

@dshafik dshafik commented Sep 15, 2013

  • If you call $this->markTestSkipped() or
    $this->markTestIncomplete() in a dataProvider, it will now skip/incomplete
    the test, counting it as one test

@mohnishbasha
Copy link

how can i add these fixes to my current phpnit 3.7 installation ?

@whatthejeff
Copy link
Contributor

Thoughts on this, @sebastianbergmann?

@szigya
Copy link

szigya commented Jan 6, 2014

related: #1074

@whatthejeff
Copy link
Contributor

Ping, @sebastianbergmann :)

/cc @jrfnl

@jrfnl
Copy link
Contributor

jrfnl commented Jul 20, 2014

Exactly what I was looking for! +1

@sebastianbergmann
Copy link
Owner

The pull request needs to updated (rebase, replase "3.8" with "4.3", ...). Then it should be good for merging.

@whatthejeff
Copy link
Contributor

@dshafik Is this something you'll have time to do? If not, I can handle it :)

@dshafik
Copy link
Contributor Author

dshafik commented Jul 21, 2014

Working on this now, @whatthejeff — just making sure the tests still pass and I'll update the PR

@whatthejeff
Copy link
Contributor

Awesome!

@dshafik
Copy link
Contributor Author

dshafik commented Jul 21, 2014

This is completed, the restructure of the repo threw me off on mac for a bit. Due to OS X case-insensitive FS it kept saying "phpunit" was deleted, when it meant the old PHPUnit top-level dir. Then when I did git checkout -- phpunit it would revert my changes to files in PHPUnit/Framework which needed to be moved to src/Framework and then I had new tests in Tests\* which conflicts with the new tests.

Any way, all fixed, tests for my additions pass, but there are failures. I checked with HEAD^ and had the same failures.

@whatthejeff
Copy link
Contributor

@dshafik Curious what the failures are. Everything passed on travis.

@dshafik
Copy link
Contributor Author

dshafik commented Jul 21, 2014

@whatthejeff what's the best way to get that information to you? Just paste the entire output into a gist?

@whatthejeff
Copy link
Contributor

@dshafik Yeah, that works for me. Also, you might want to bump the copyright years.

@dshafik
Copy link
Contributor Author

dshafik commented Jul 21, 2014

- If you call `$this->markTestSkipped()` or
  `$this->markTestIncomplete()` in a dataProvider, it will
now skip/incomplete the test, counting it as one test
@dshafik
Copy link
Contributor Author

dshafik commented Jul 21, 2014

bumped the copyright years, @whatthejeff :)

@whatthejeff
Copy link
Contributor

The test failures seem to be related to the filesystem issues you were having with OS X. I can tell you that all tests pass when I do a fresh checkout on OS X.

whatthejeff added a commit that referenced this pull request Jul 21, 2014
Allow markTestSkipped/Incomplete() in dataProvider
@whatthejeff whatthejeff merged commit 804a04a into sebastianbergmann:master Jul 21, 2014
@whatthejeff
Copy link
Contributor

Thanks for your contribution, @dshafik!

@dshafik
Copy link
Contributor Author

dshafik commented Jul 21, 2014

@whatthejeff can confirm about the failures, all is fine on a fresh checkout. Thanks for merging! :)

@jrfnl
Copy link
Contributor

jrfnl commented Jul 21, 2014

Thanks @dshafik for the quick update and @whatthejeff for the merge! 💕

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.

None yet

6 participants