GitHub user jsoref opened a pull request:
https://github.com/apache/cordova-lib/pull/50
CB-7056 serve: fix Android test, make tests conditional
Fix **Android** merges codepath, as it turns out that merges
doesn't need the platform specific hack.
Adding **BlackBerry 10** test.
**Android**, **iOS** and **BlackBerry 10** require specific scripts
to be available, otherwise they fail.
Introduce `itifapps` and `cit` (conditional `it`) based on **Jasmine**'s:
* `xit` -- ignore test
* `iit` -- run these tests, but skip it tests
* `it` -- run these tests, unless there are iit tests
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/jsoref/cordova-lib cb_7056
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cordova-lib/pull/50.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #50
----
commit fe873fd12b87ebc52866bb1f494ffdaa31a278b7
Author: Josh Soref <jso...@blackberry.com>
Date: 2014-07-02T16:54:10Z
CB-7056 serve: fix Android test, make tests conditional
Fix **Android** merges codepath, as it turns out that merges
doesn't need the platform specific hack.
Adding **BlackBerry 10** test.
**Android**, **iOS** and **BlackBerry 10** require specific scripts
to be available, otherwise they fail.
Introduce `itifapps` and `cit` (conditional `it`) based on **Jasmine**'s:
* `xit` -- ignore test
* `iit` -- run these tests, but skip it tests
* `it` -- run these tests, unless there are iit tests
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
