Skip to content

Commit 275df29

Browse files
committed
Revert "Remove saucelabs"
This reverts commit defbe13.
1 parent 99350d7 commit 275df29

File tree

4 files changed

+107
-1
lines changed

4 files changed

+107
-1
lines changed

Diff for: .gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
coverage
22
node_modules
33
test/lib
4-
.vscode

Diff for: Gruntfile.js

+104
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,108 @@ module.exports = function(grunt) {
3535
}
3636
}
3737
},
38+
'saucelabs-mocha': {
39+
all: {
40+
options: {
41+
username: process.env.SAUCE_USERNAME,
42+
key: process.env.SAUCE_ACCESS_KEY,
43+
urls: ['http://127.0.0.1:3000/unittests.html'],
44+
build: process.env.TRAVIS_JOB_ID,
45+
testname: 'Sauce Unit Test for scrypt-async-js',
46+
browsers: [
47+
{
48+
browserName: "safari",
49+
platform: "OS X 10.10"
50+
},
51+
{
52+
browserName: "chrome",
53+
platform: "OS X 10.10",
54+
version: "48"
55+
},
56+
{
57+
browserName: "firefox",
58+
platform: "OS X 10.10",
59+
version: "44"
60+
},
61+
{
62+
browserName: "microsoftedge",
63+
version: "13.10586",
64+
platform: "Windows 10"
65+
},
66+
{
67+
browserName: "internet explorer",
68+
version: "11",
69+
platform: "Windows 8.1"
70+
},
71+
{
72+
browserName: "internet explorer",
73+
version: "10",
74+
platform: "Windows 8"
75+
},
76+
{
77+
browserName: "internet explorer",
78+
version: "9",
79+
platform: "Windows 7"
80+
},
81+
{
82+
browserName: "internet explorer",
83+
version: "8",
84+
platform: "Windows 7"
85+
},
86+
{
87+
browserName: "chrome",
88+
platform: "Windows 8.1",
89+
version: "beta"
90+
},
91+
{
92+
browserName: "firefox",
93+
platform: "Windows 8.1",
94+
version: "beta"
95+
},
96+
{
97+
browserName: "iphone",
98+
platform: "OS X 10.10",
99+
version: "8.2"
100+
},
101+
{
102+
browserName: "chrome",
103+
platform: "Linux",
104+
version: "37"
105+
},
106+
{
107+
browserName: "firefox",
108+
platform: "Linux",
109+
version: "34"
110+
},
111+
{
112+
browserName: "android",
113+
platform: "Linux",
114+
version: "5.1"
115+
},
116+
{
117+
browserName: "android",
118+
platform: "Linux",
119+
version: "4.4"
120+
},
121+
{
122+
browserName: "iphone",
123+
platform: "OS X 10.10",
124+
version: "7.1"
125+
},
126+
{
127+
browserName: "iphone",
128+
platform: "OS X 10.10",
129+
version: "9.2"
130+
}
131+
],
132+
public: "public",
133+
maxRetries: 3,
134+
throttled: 2,
135+
pollInterval: 4000,
136+
statusCheckAttempts: 200
137+
}
138+
},
139+
},
38140
uglify: {
39141
scrypt: {
40142
options: {
@@ -52,6 +154,7 @@ module.exports = function(grunt) {
52154
grunt.loadNpmTasks('grunt-contrib-copy');
53155
grunt.loadNpmTasks('grunt-contrib-uglify');
54156
grunt.loadNpmTasks('grunt-mocha-istanbul')
157+
grunt.loadNpmTasks('grunt-saucelabs');
55158

56159
grunt.event.on('coverage', function(lcov, done){
57160
require('coveralls').handleInput(lcov, function(err){
@@ -65,4 +168,5 @@ module.exports = function(grunt) {
65168
grunt.registerTask('build', ['uglify']);
66169
grunt.registerTask('test', ['browserify', 'copy:test', 'mocha_istanbul']);
67170
grunt.registerTask('test_and_coveralls', ['browserify', 'copy:test', 'mocha_istanbul:coveralls']);
171+
grunt.registerTask('saucelabs', ['connect', 'saucelabs-mocha']);
68172
};

Diff for: README.md

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ scrypt-async
44
[![Build Status](https://travis-ci.org/dchest/scrypt-async-js.svg?branch=master)](https://travis-ci.org/dchest/scrypt-async-js)
55
[![Coverage Status](https://coveralls.io/repos/dchest/scrypt-async-js/badge.svg)](https://coveralls.io/r/dchest/scrypt-async-js)
66

7+
[![Saucelabs Test Status](https://saucelabs.com/browser-matrix/scrypt.svg)](https://saucelabs.com/u/scrypt)
8+
79
Fast "async" scrypt implementation in JavaScript.
810

911
Works in browsers without throwing out "kill slow script" warnings due to

Diff for: package.json

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"grunt-contrib-copy": "1.0.0",
1616
"grunt-contrib-uglify": "1.0.1",
1717
"grunt-mocha-istanbul": "3.0.1",
18+
"grunt-saucelabs": "8.6.2",
1819
"istanbul": "0.4.2",
1920
"mocha": "2.4.5"
2021
},

0 commit comments

Comments
 (0)