--- a/components/javascript/qunit/Makefile Thu May 19 11:16:35 2016 -0700
+++ b/components/javascript/qunit/Makefile Thu May 19 13:47:57 2016 -0700
@@ -20,21 +20,22 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= qunit
-COMPONENT_VERSION= 1.18.0
+COMPONENT_VERSION= 1.23.1
COMPONENT_PROJECT_URL= http://qunitjs.com/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_VERSION).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:4b66ea61546142aef95c6cb135fc66d646f2d6527b5c190d8596f15424c05041
+COMPONENT_ARCHIVE_HASH= \
+ sha256:38f0f23e8441e1e2da6d4e90a10b85304eb52002d570e7016015d05718d4a3d5
COMPONENT_ARCHIVE_URL= https://github.com/jquery/qunit/archive/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= javascript/qunit
-TPNO= 23283
+TPNO= 27977
include ../../../make-rules/prep.mk
include ../../../make-rules/ips.mk
@@ -45,18 +46,18 @@
# To run the test, you'll need to get pre-built installer of node.js for
# Solaris at nodejs.org since node.js is not delivered as part of Solaris
# yet.
-# Then go to qunit's source code root, 'qunit-1.18.0',
+# Then go to qunit's source code root, such as 'qunit-1.23.1',
# run `npm install -g grunt-cli` to have a global grunt binary,
# and run `npm install` to get required node modules for additional grunt tasks.
# Finally run `grunt` to start running all the test tasks.
-# However, phantomjs is not supported well in Solaris and there is not an intutive
+# However, phantomjs is not supported well in Solaris and there is not an intuitive
# patch for fixing it, therefore `npm install` fails when it tries to install
# phantomjs, and the test taks can't be run.
# The phantomjs issue is discussed at:
#
# https://github.com/ariya/phantomjs/issues/10521
#
-# These test tasks are passed sucessfully in a Mac OSX laptop. It'd be fine
+# These test tasks are passed successfully in a Mac OSX laptop. It'd be fine
# to use QUnit in the browser.
test: $(NO_TESTS)
--- a/components/javascript/qunit/other-licenses.txt Thu May 19 11:16:35 2016 -0700
+++ b/components/javascript/qunit/other-licenses.txt Thu May 19 13:47:57 2016 -0700
@@ -1,5 +1,3 @@
-/*istanbul ignore next */
-// jscs:disable maximumLineLength
/*
* This file is a modified version of google-diff-match-patch's JavaScript implementation
* (https://code.google.com/p/google-diff-match-patch/source/browse/trunk/javascript/diff_match_patch_uncompressed.js),
--- a/components/javascript/qunit/qunit.p5m Thu May 19 11:16:35 2016 -0700
+++ b/components/javascript/qunit/qunit.p5m Thu May 19 13:47:57 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -37,8 +37,10 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2015/298
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file qunit/qunit.css path=usr/share/lib/javascript/qunit/1.18.0/qunit.css
-file qunit/qunit.js path=usr/share/lib/javascript/qunit/1.18.0/qunit.js
-link path=usr/share/lib/javascript/qunit/latest target=1.18.0
+file qunit/qunit.css \
+ path=usr/share/lib/javascript/qunit/$(IPS_COMPONENT_VERSION)/qunit.css
+file qunit/qunit.js \
+ path=usr/share/lib/javascript/qunit/$(IPS_COMPONENT_VERSION)/qunit.js
+link path=usr/share/lib/javascript/qunit/latest target=$(IPS_COMPONENT_VERSION)
license other-licenses.txt license="Apache 2.0"
license LICENSE.txt license=MIT