Skip to content

Commit 2d69162

Browse files
mar10mar10
committed
Cleanup
1 parent 784622a commit 2d69162

8 files changed

+83
-129
lines changed

‎Gruntfile.coffee

Lines changed: 28 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -48,115 +48,73 @@ module.exports = (grunt) ->
4848
jshintrc: ".jshintrc"
4949

5050
qunit:
51-
all: ["test/index.html", "test/index-jquery-ui-1-10.html"]
52-
53-
# replace: # grunt-text-replace
54-
# production:
55-
# src: ["build/**/*.js"]
56-
# overwrite : true
57-
# replacements: [ {
58-
# from : /@DATE/g
59-
# # https://github.com/felixge/node-dateformat
60-
# to : "<%= grunt.template.today('isoUtcDateTime') %>"
61-
# },{
62-
# from : /buildType:\s*\"[a-zA-Z]+\"/g
63-
# to : "buildType: \"production\""
64-
# },{
65-
# from : /debugLevel:\s*[0-9]/g
66-
# to : "debugLevel: 1"
67-
# } ]
68-
# release:
69-
# src: ["dist/**/*.js"]
70-
# overwrite : true
71-
# replacements: [ {
72-
# from : /@VERSION/g
73-
# to : "<%= pkg.version %>"
74-
# } ]
51+
all: [
52+
"test/test-jquery-3-ui-1.12.html",
53+
"test/test-jquery-1.12-ui-1.12.html",
54+
"test/test-jquery-1.11-ui-1.11.html",
55+
"test/test-jquery-1.9-ui-1.10.html",
56+
]
7557

7658
"saucelabs-qunit":
77-
ui_10:
59+
options:
60+
build: process.env.TRAVIS_JOB_ID
61+
throttled: 5
62+
# statusCheckAttempts: 180
63+
recordVideo: false
64+
videoUploadOnPass: false
65+
66+
ui_12:
7867
options:
68+
testname: "jquery.ui-contextmenu qunit tests (jQuery UI 12)"
7969
urls: [
80-
# "http://localhost:9999/test/index.html",
81-
"http://localhost:9999/test/test-jquery-1.9-ui-1.10.html"
70+
"http://localhost:9999/test/test-jquery-3-ui-1.12.html"
8271
]
83-
build: process.env.TRAVIS_JOB_ID
84-
throttled: 5
8572
browsers: [
8673
{ browserName: "chrome", platform: "Windows 8.1" }
87-
# { browserName: "firefox", platform: "Windows 8.1" }
74+
{ browserName: "firefox", platform: "Windows 8.1" }
8875
{ browserName: "firefox", platform: "Linux" }
89-
# { browserName: "internet explorer", version: "6", platform: "Windows XP" }
90-
# { browserName: "internet explorer", version: "7", platform: "Windows XP" }
91-
# { browserName: "internet explorer", version: "8", platform: "Windows 7" }
76+
# jQuery UI 12+ stopped support for IE <= 10
9277
{ browserName: "internet explorer", version: "11", platform: "Windows 8.1" }
9378
{ browserName: "microsoftedge", platform: "Windows 10" }
94-
# { browserName: "safari", version: "9", platform: "OS X 10.11" }
79+
# { browserName: "safari", version: "6", platform: "OS X 10.8" }
80+
# { browserName: "safari", version: "7", platform: "OS X 10.9" }
81+
# { browserName: "safari", version: "8", platform: "OS X 10.10" }
82+
{ browserName: "safari", version: "9", platform: "OS X 10.11" }
9583
{ browserName: "safari", version: "10", platform: "OS X 10.12" }
84+
{ browserName: "safari", version: "11", platform: "OS X 10.12" }
9685
]
97-
testname: "jquery.ui-contextmenu qunit tests (jQuery UI 10)"
98-
# statusCheckAttempts: 180
99-
recordVideo: false
100-
videoUploadOnPass: false
10186

102-
ui_11: # UI Menu 11+ dropped support for IE7
87+
ui_11: # UI Menu 11+ dropped support for IE7
10388
options:
89+
testname: "jquery.ui-contextmenu qunit tests (jQuery UI 11+)"
10490
urls: [
10591
"http://localhost:9999/test/test-jquery-1.11-ui-1.11.html"
106-
# "http://localhost:9999/test/index.html",
107-
# "http://localhost:9999/test/index-jquery-ui-1-10.html"
10892
]
109-
110-
# username: process.env.SAUCE_USERNAME,
111-
# key: process.env.SAUCE_ACCESS_KEY,
112-
build: process.env.TRAVIS_JOB_ID
113-
throttled: 5
11493
browsers: [
11594
{ browserName: "chrome", platform: "Windows 8.1" }
116-
# { browserName: "firefox", platform: "Windows 8.1" }
117-
# { browserName: "firefox", platform: "Windows XP" }
11895
{ browserName: "firefox", platform: "Linux" }
11996
# jQuery UI 11+ stopped support for IE <= 7
12097
{ browserName: "internet explorer", version: "8", platform: "Windows 7" }
12198
{ browserName: "internet explorer", version: "9", platform: "Windows 7" }
12299
{ browserName: "internet explorer", version: "10", platform: "Windows 8" }
123100
{ browserName: "internet explorer", version: "11", platform: "Windows 8.1" }
124101
{ browserName: "microsoftedge", platform: "Windows 10" }
125-
# { browserName: "safari", version: "6", platform: "OS X 10.8" }
126-
# { browserName: "safari", version: "7", platform: "OS X 10.9" }
127-
# { browserName: "safari", version: "8", platform: "OS X 10.10" }
128-
# { browserName: "safari", version: "9", platform: "OS X 10.11" }
129102
{ browserName: "safari", version: "10", platform: "OS X 10.12" }
130103
]
131-
testname: "jquery.ui-contextmenu qunit tests (jQuery UI 11+)"
132-
# statusCheckAttempts: 180
133-
recordVideo: false
134-
videoUploadOnPass: false
135104

136-
ui_12:
105+
ui_10:
137106
options:
107+
testname: "jquery.ui-contextmenu qunit tests (jQuery UI 10)"
138108
urls: [
139-
"http://localhost:9999/test/test-jquery-3-ui-1.12.html"
109+
"http://localhost:9999/test/test-jquery-1.9-ui-1.10.html"
140110
]
141-
build: process.env.TRAVIS_JOB_ID
142-
throttled: 5
143111
browsers: [
144112
{ browserName: "chrome", platform: "Windows 8.1" }
145-
{ browserName: "firefox", platform: "Windows 8.1" }
146113
{ browserName: "firefox", platform: "Linux" }
147-
# jQuery UI 12+ stopped support for IE <= 10
148114
{ browserName: "internet explorer", version: "11", platform: "Windows 8.1" }
149115
{ browserName: "microsoftedge", platform: "Windows 10" }
150-
# { browserName: "safari", version: "6", platform: "OS X 10.8" }
151-
# { browserName: "safari", version: "7", platform: "OS X 10.9" }
152-
# { browserName: "safari", version: "8", platform: "OS X 10.10" }
153-
{ browserName: "safari", version: "9", platform: "OS X 10.11" }
154116
{ browserName: "safari", version: "10", platform: "OS X 10.12" }
155117
]
156-
testname: "jquery.ui-contextmenu qunit tests (jQuery UI 12)"
157-
# statusCheckAttempts: 180
158-
recordVideo: false
159-
videoUploadOnPass: false
160118

161119
uglify:
162120
options:

‎package-lock.json

Lines changed: 28 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"grunt-contrib-concat": "^1.0.0",
4747
"grunt-contrib-connect": "^1.0.0",
4848
"grunt-contrib-jshint": "^1.0.0",
49-
"grunt-contrib-qunit": "^1.0.0",
49+
"grunt-contrib-qunit": "^1.3.0",
5050
"grunt-contrib-uglify": "^1.0.0",
5151
"grunt-contrib-watch": "^1.0.0",
5252
"grunt-exec": "^1.0.0",
@@ -69,4 +69,4 @@
6969
]
7070
}
7171
]
72-
}
72+
}

‎test/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<meta charset="UTF-8">
55
<title>QUnit Composite Test Suite</title>
66

7-
<link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.23.0.css">
7+
<link rel="stylesheet" href="https://code.jquery.com/qunit/qunit-1.23.0.css">
88
<link rel="stylesheet" href="../lib/qunit-composite.css">
99

10-
<script src="http://code.jquery.com/jquery-1.12.4.min.js"></script>
11-
<script src="http://code.jquery.com/qunit/qunit-1.23.0.js"></script>
10+
<script src="https://code.jquery.com/jquery-1.12.4.min.js"></script>
11+
<script src="https://code.jquery.com/qunit/qunit-1.23.0.js"></script>
1212
<script src="../lib/qunit-composite.js"></script>
1313

1414
<script>

‎test/test-jquery-1.11-ui-1.11.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
<head>
44
<meta charset="utf-8">
55
<title>jquery.ui-contextmenu Test Suite</title>
6-
<link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.23.0.css">
7-
<script src="http://code.jquery.com/jquery-1.11.3.min.js"></script>
8-
<script src="http://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script>
9-
<script src="http://code.jquery.com/qunit/qunit-1.23.0.js"></script>
6+
7+
<link rel="stylesheet" href="https://code.jquery.com/qunit/qunit-1.23.1.css">
8+
<script src="https://code.jquery.com/jquery-1.11.3.min.js"></script>
9+
<script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script>
10+
<script src="https://code.jquery.com/qunit/qunit-1.23.1.js"></script>
11+
1012
<script src="../jquery.ui-contextmenu.js"></script>
1113
<script src="tests.js"></script>
1214
</head>

‎test/test-jquery-1.12-ui-1.12.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
<head>
44
<meta charset="utf-8">
55
<title>jquery.ui-contextmenu Test Suite</title>
6-
<link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.23.0.css">
7-
<script src="http://code.jquery.com/jquery-1.12.4.min.js"></script>
8-
<script src="http://code.jquery.com/ui/1.12.1/jquery-ui.min.js"></script>
9-
<script src="http://code.jquery.com/qunit/qunit-1.23.0.js"></script>
6+
7+
<link rel="stylesheet" href="https://code.jquery.com/qunit/qunit-1.23.1.css">
8+
<script src="https://code.jquery.com/jquery-1.12.4.min.js"></script>
9+
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"></script>
10+
<script src="https://code.jquery.com/qunit/qunit-1.23.1.js"></script>
11+
1012
<script src="../jquery.ui-contextmenu.js"></script>
1113
<script src="tests.js"></script>
1214
</head>

‎test/test-jquery-1.9-ui-1.10.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
<head>
44
<meta charset="utf-8">
55
<title>jquery.ui-contextmenu Test Suite</title>
6-
<link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.23.0.css">
7-
<script src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
8-
<script src="http://code.jquery.com/ui/1.10.4/jquery-ui.min.js"></script>
9-
<script src="http://code.jquery.com/qunit/qunit-1.23.0.js"></script>
6+
7+
<link rel="stylesheet" href="https://code.jquery.com/qunit/qunit-1.23.1.css">
8+
<script src="https://code.jquery.com/jquery-1.9.1.min.js"></script>
9+
<script src="https://code.jquery.com/ui/1.10.4/jquery-ui.min.js"></script>
10+
<script src="https://code.jquery.com/qunit/qunit-1.23.1.js"></script>
11+
1012
<script src="../jquery.ui-contextmenu.js"></script>
1113
<script src="tests.js"></script>
1214
</head>

‎test/test-jquery-3-ui-1.12.html

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,12 @@
33
<head>
44
<meta charset="utf-8">
55
<title>jquery.ui-contextmenu Test Suite</title>
6-
<link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.23.0.css">
76

8-
<!-- <script src="http://code.jquery.com/jquery-1.11.3.min.js"></script> -->
9-
<!-- <script src="http://code.jquery.com/jquery-1.12.4.min.js"></script> -->
10-
<script src="http://code.jquery.com/jquery-3.2.1.min.js"></script>
11-
<!-- <script src="http://code.jquery.com/jquery-migrate-3.0.0.min.js"></script> -->
7+
<link rel="stylesheet" href="https://code.jquery.com/qunit/qunit-1.23.1.css">
8+
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
9+
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"></script>
10+
<script src="https://code.jquery.com/qunit/qunit-1.23.1.js"></script>
1211

13-
<script src="http://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
14-
15-
<script src="http://code.jquery.com/qunit/qunit-1.23.0.js"></script>
1612
<script src="../jquery.ui-contextmenu.js"></script>
1713
<script src="tests.js"></script>
1814
</head>

0 commit comments

Comments
 (0)