Skip to content

Commit

Permalink
build: Update development dependencies; add test for PHP 7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Krinkle committed Dec 29, 2018
1 parent 4d47567 commit 8d4a7fc
Show file tree
Hide file tree
Showing 12 changed files with 39 additions and 50 deletions.
27 changes: 13 additions & 14 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
{
"boss": true,
"bitwise": true,
"browser": true,
"curly": true,
"eqeqeq": true,
"eqnull": true,
"expr": true,
"esversion": 3,
"immed": true,
"latedef": false,
"newcap": true,
"noarg": true,
"noempty": true,
"predef": [
"SWARM",
"jQuery"
],
"onevar": true,
"quotmark": "double",
"smarttabs": true,
"trailing": true,
"undef": true,
"unused": true,

"bitwise": true,
"browser": true,
"es3": true,
"latedef": true,
"newcap": true,
"noempty": true,

"predef": [
"SWARM",
"jQuery"
]
"boss": true,
"eqnull": true,
"expr": true
}
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sudo: false
language: php
php:
- "7.1"
- "5.6"
- "5.5"
- "5.4"
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Welcome! Thanks for your interest in contributing to TestSwarm. You're **almost** in the right place. More information on how to contribute to this and all other jQuery Foundation projects is over at [contribute.jquery.org](http://contribute.jquery.org). You'll definitely want to take a look at the articles on contributing [code](http://contribute.jquery.org/code).
Welcome! Thanks for your interest in contributing to TestSwarm. You're **almost** in the right place. More information on how to contribute to this and all other jQuery Foundation projects is over at [contribute.jquery.org](https://contribute.jquery.org). You'll definitely want to take a look at the articles on contributing [code](https://contribute.jquery.org/code).

You may also want to take a look at our [commit & pull request guide](http://contribute.jquery.org/commits-and-pull-requests/) and [style guides](http://contribute.jquery.org/style-guide/) for instructions on how to maintain your fork and submit your code. Before we can merge any pull request, we'll also need you to sign our [contributor license agreement](http://contribute.jquery.org/cla).
You may also want to take a look at our [commit & pull request guide](https://contribute.jquery.org/commits-and-pull-requests/) and [style guides](https://contribute.jquery.org/style-guide/) for instructions on how to maintain your fork and submit your code. Before we can merge any pull request, we'll also need you to sign our [contributor license agreement](https://contribute.jquery.org/cla).

You can find us on [IRC](http://irc.jquery.org), specifically in #jquery-dev should you have any questions. If you've never contributed to open source before, we've put together [a short guide with tips, tricks, and ideas on getting started](http://contribute.jquery.org/open-source/).
You can find us on [IRC](https://irc.jquery.org), specifically in #jquery-dev should you have any questions. If you've never contributed to open source before, we've put together [a short guide with tips, tricks, and ideas on getting started](https://contribute.jquery.org/open-source/).
26 changes: 8 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ TestSwarm is still in use in projects of the jQuery Foundation, but it isn't und

Within the jQuery Foundation, we're experimenting with alternative projects, to eventually shut down our own instance of TestSwarm:

- [Karma](http://karma-runner.github.io/)
- [Karma](https://karma-runner.github.io/)
- [Intern](https://theintern.io/)
- [browserstack-runner](https://github.com/browserstack/browserstack-runner/)
- [Intern](http://theintern.io/)

We recommend reviewing those and other alternatives.

Expand All @@ -39,7 +39,7 @@ Releases will be numbered in the following format:

The `-alpha` suffix is used to indicate unreleased versions in development.

For more information on SemVer, please visit http://semver.org/.
For more information on SemVer, please visit <https://semver.org/>.


Bug tracker
Expand Down Expand Up @@ -121,36 +121,26 @@ Get involved
You're welcome to use the GitHub [issue tracker](https://github.com/jquery/testswarm/issues)
to start discussions.

Or post to the [QUnit and Testing forum](https://forum.jquery.com/qunit-and-testing).

Most of us are also on IRC in the
[#jquery-dev](http://webchat.freenode.net/?channels=jquery-dev) channel at
irc.freenode.net

Planning for TestSwarm and other projects related to testing of javascript
applications based around jQuery happens on the [jQuery Testing Team
wiki](http://jquerytesting.pbworks.com)
Some of us are also on Gitter at [jquery/dev](https://gitter.im/jquery/dev).


Documentation
---------------------

* [TestSwarm wiki](https://github.com/jquery/testswarm/wiki)
* [Submit jobs README](https://github.com/jquery/testswarm/blob/master/scripts/addjob/README.md)
* [more wiki pages](https://github.com/jquery/testswarm/wiki/_pages)


Copyright and license
---------------------

See [LICENSE.txt](https://raw.github.com/jquery/testswarm/master/LICENSE.txt).
See [LICENSE.txt](https://github.com/jquery/testswarm/blob/master/LICENSE.txt).


History
---------------------

TestSwarm was originally created by [John Resig](http://ejohn.org/) as a
TestSwarm was originally created by [John Resig](https://johnresig.com/) as a
basic tool to support unit testing of the [jQuery JavaScript
library](http://jquery.com). It was later moved to become an official
[Mozilla Labs](http://labs.mozilla.com/) and has since moved again to become
a [jQuery](http://jquery.org/) project.
library](https://jquery.com). It later become a [Mozilla Labs](http://labs.mozilla.com/) project,
and has since moved again to become a [jQuery Foundation](https://jquery.org/) project.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ua-parser/uap-php": "3.4.7"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9"
"jakub-onderka/php-parallel-lint": "1.0.0"
},
"scripts": {
"test": [
Expand Down
2 changes: 1 addition & 1 deletion inc/Api.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function output() {
echo json_encode2( $this->response );
break;

// http://stackoverflow.com/a/8811412/319266
// https://stackoverflow.com/a/8811412/319266
case 'jsonp':
header( 'Content-Type: text/javascript; charset=utf-8' );
$callback = $this->context->getRequest()->getVal( 'callback', '' );
Expand Down
2 changes: 1 addition & 1 deletion inc/Database.php
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public function tableExists( $table ) {
/**
* @param $table string
* @param $fieldName string
* @return bool|object: see also http://php.net/mysqli-result.fetch-field-direct
* @return bool|object: see also https://php.net/mysqli-result.fetch-field-direct
*/
public function fieldInfo( $table, $fieldName ) {
$table = $this->addIdentifierQuotes( $table );
Expand Down
4 changes: 2 additions & 2 deletions inc/utilities.php
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ function str_queryf($string) {
/**
* PHP has natsort() but no natksort().
*
* @source http://stackoverflow.com/a/1186347/319266
* @source https://stackoverflow.com/a/1186347/319266
* @see php.net/uksort, php.net/natsort, php.net/strnatcmp
*/
function natksort( &$array ) {
Expand All @@ -212,7 +212,7 @@ function natksort( &$array ) {
/**
* PHP has natcasesort() but no natcaseksort().
*
* @source http://stackoverflow.com/a/1186347/319266
* @source https://stackoverflow.com/a/1186347/319266
* @see php.net/uksort, php.net/natcasesort, php.net/strnatcasecmp
*/
function natcaseksort( &$array ) {
Expand Down
4 changes: 2 additions & 2 deletions js/inject.js
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@

testFrameworks = {
// QUnit (by jQuery)
// http://docs.jquery.com/QUnit
// https://qunitjs.com
"QUnit": {
detect: function() {
return typeof QUnit !== "undefined";
Expand Down Expand Up @@ -481,7 +481,7 @@
},

// Mocha
// http://visionmedia.github.com/mocha/
// https://mochajs.org/
"Mocha": {
detect: function() {
return typeof Mocha !== "undefined" && typeof mocha !== "undefined";
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"test": "node test/pretty.js && jshint ."
},
"devDependencies": {
"jshint": "2.8.0",
"timekeeper": "^1.0.0"
"jshint": "2.9.7",
"timekeeper": "1.0.0"
}
}
8 changes: 4 additions & 4 deletions scripts/addjob/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ Be sure to obtain an authentication token first by [creating a project](../#crea

Before you can submit a job you have to have an actual test suite. Presumably you already have this but there are a few requirements that you need to check and implement as needed. Currently TestSwarm supports the following unit test frameworks:

* [QUnit](http://qunitjs.com/) (jQuery)
* [UnitTestJS](http://github.com/tobie/unittest_js) (Prototype, Scriptaculous)
* [QUnit](https://qunitjs.com/) (jQuery)
* [UnitTestJS](https://github.com/tobie/unittest_js) (Prototype, Scriptaculous)
* [JSSpec](https://code.google.com/p/jsspec/) (MooTools)
* [JSUnit](http://www.jsunit.net/)
* [Selenium Core](http://seleniumhq.org/projects/core/)
* [Dojo Objective Harness](http://docs.dojocampus.org/quickstart/doh)
* [Screw.Unit](https://github.com/nathansobo/screw-unit)
* [Mocha](https://github.com/visionmedia/mocha)
* [Mocha](https://github.com/mochajs/mocha)

The test suite must run from a publicly accessible URL that serves an HTML document (may be generated from e.g. PHP or a static file, extension doesn't matter) and needs to support being run in an `<iframe>` (e.g. no `X-IFrame-Options` headers that disallow embedding from a different origin, or javascript that forces being in the `top` window context).

Expand Down Expand Up @@ -45,7 +45,7 @@ Note that any QUnit specific details here may out of date. Pay attention to the
<script src="libs/jquery.qunit/jquery.qunit.js"></script>

<!-- TestSwarm link -->
<script src="http://example.org/testswarm/js/inject.js"></script>
<script src="https://example.org/testswarm/js/inject.js"></script>

<!-- Your application scripts -->
<script src="src/foo.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion test/pretty.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true, es3: false */
/*jshint node:true, esversion: 5 */
var assert = require( "assert" ),
tk = require( "timekeeper" ),
prettyDate = require( "../js/pretty" ).prettyDate;
Expand Down

0 comments on commit 8d4a7fc

Please sign in to comment.