us-east-1 dc is not mapped to headless env anymore

scripts/constants.js

@@ -28,10 +28,6 @@ export interface SauceLabsOptions {
      * - us-east-4 (short 'us-east')
      */
     region?: ${regions};
-    /**
-     * If set to true you are accessing the headless Sauce instances (this discards the region option).
-     */
-    headless?: boolean;
     /**
      * If you want to tunnel your API request through a proxy please provide your proxy URL.
      */

scripts/generate-typings.js

@@ -89,7 +89,6 @@ fs.readdir(path.join(__dirname, '../apis'), (err, files) => {
     username: string;
     region: string;
     tld: string;
-    headless: boolean;
     webdriverEndpoint: string;\n\n
     ${methods}
 }

src/cli.js

@@ -47,18 +47,20 @@ export const run = () => {
         }
       },
       async (argv) => {
-        const {user, key, headless, region, proxy, tld} = Object.assign(
+        const {user, key, region, proxy, tld} = Object.assign(
           {},
           DEFAULT_OPTIONS,
           argv
         );
-        const api = new SauceLabs({user, key, headless, region, proxy, tld});
+        const api = new SauceLabs({user, key, region, proxy, tld});
         const requiredParams = params
           .filter((p) => p.required)
           .map((p) => argv[p.name]);
 
         try {
           const result = await api[commandName](...requiredParams, argv);
+          console.log(commandName);
+          console.log(requiredParams);
 
           if (typeof result === 'object') {
             // eslint-disable-next-line no-console

src/commands/sc.js

@@ -9,11 +9,7 @@ export const builder = (yargs) => {
   }
 };
 export const handler = async (argv) => {
-  const {user, key, headless, region, proxy} = Object.assign(
-    {},
-    DEFAULT_OPTIONS,
-    argv
-  );
-  const api = new SauceLabs({user, key, headless, region, proxy});
+  const {user, key, region, proxy} = Object.assign({}, DEFAULT_OPTIONS, argv);
+  const api = new SauceLabs({user, key, region, proxy});
   return api.startSauceConnect(argv, true);
 };

src/constants.js

@@ -87,7 +87,6 @@ export const JOB_ASSET_NAMES = [
 export const DEFAULT_OPTIONS = {
   user: process.env.SAUCE_USERNAME,
   key: process.env.SAUCE_ACCESS_KEY,
-  headless: false,
   region: 'us',
   proxy: process.env.HTTPS_PROXY || process.env.HTTP_PROXY,
   headers: {'User-Agent': `saucelabs/v${version} (nodejs ${os.platform()})`},
@@ -137,13 +136,6 @@ export const CLI_PARAMS = [
     description:
       'your Sauce Labs datacenter region, the following regions are available: `us-west-1` (short `us`), `eu-central-1` (short `eu`)',
   },
-  {
-    name: 'headless',
-    default: DEFAULT_OPTIONS.headless,
-    description:
-      'if set to true you are accessing the headless Sauce instances (this discards the `region` option)',
-    boolean: true,
-  },
   {
     alias: 'p',
     name: 'proxy',

src/index.js

@@ -72,7 +72,6 @@ export default class SauceLabs {
      */
     this.region = this._options.region;
     this.tld = this._options.tld;
-    this.headless = this._options.headless;
     this.webdriverEndpoint = `https://ondemand.${getRegionSubDomain(
       options
     )}.saucelabs.com/`;
@@ -84,7 +83,6 @@ export default class SauceLabs {
           -6
         )}`,
         region: this._options.region,
-        headless: this._options.headless,
         proxy: this._options.proxy,
         webdriverEndpoint: this.webdriverEndpoint,
         headers: this._options.headers,

src/utils.js

@@ -109,7 +109,6 @@ export function toString(scope) {
   username: '${scope.username}',
   key: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXX${scope._accessKey.slice(-6)}',
   region: '${scope._options.region}',
-  headless: ${scope._options.headless},
   proxy: ${scope._options.proxy}
 }`;
 }

tests/cli.test.js

@@ -50,7 +50,6 @@ test('should be able to execute a command', async () => {
   const params = {
     user: 'foobaruser',
     key: 'barfookey',
-    headless: true,
     region: 'anywhere',
     username: 'username-param',
     limit: 42,
@@ -62,7 +61,6 @@ test('should be able to execute a command', async () => {
   expect(api.options).toEqual({
     user: 'foobaruser',
     key: 'barfookey',
-    headless: true,
     region: 'anywhere',
   });
   expect(api.listJobs).toBeCalledWith('username-param', params);

tests/commands/sc.test.js

@@ -1,4 +1,4 @@
-import {builder, handler} from '../../src/commands/sc';
+import {builder} from '../../src/commands/sc';
 
 jest.mock('../../src/index', () => {
   class SauceLabsMock {
@@ -19,9 +19,3 @@ test('builder', () => {
   builder(yargs);
   expect(yargs.option).toBeCalledWith('tunnel-name', expect.any(Object));
 });
-
-test('handler', async () => {
-  const api = await handler({headless: true});
-  expect(api.scStarted).toBe(true);
-  expect(api.startSauceConnect).toBeCalledWith({headless: true}, true);
-});

tests/index.test.js

@@ -64,7 +64,6 @@ test('should be inspectable', () => {
   username: 'foo',
   key: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXbar',
   region: 'us',
-  headless: false,
   proxy: undefined`);
 });
 
@@ -453,7 +452,7 @@ test('should contain custom headers', async () => {
 describe('startSauceConnect', () => {
   it('should start sauce connect with proper parsed args', async () => {
     const logs = [];
-    const api = new SauceLabs({user: 'foo', key: 'bar', headless: true});
+    const api = new SauceLabs({user: 'foo', key: 'bar'});
     setTimeout(
       () =>
         stdoutEmitter.emit(
@@ -479,7 +478,7 @@ describe('startSauceConnect', () => {
 
   it('should start sauce connect with latest version if no version is specified in the args', async () => {
     const logs = [];
-    const api = new SauceLabs({user: 'foo', key: 'bar', headless: true});
+    const api = new SauceLabs({user: 'foo', key: 'bar'});
     got.mockReturnValue(
       Promise.resolve({
         body: {
@@ -506,7 +505,7 @@ describe('startSauceConnect', () => {
 
   it('should start sauce connect with fallback default version in case the call to the API failed', async () => {
     const logs = [];
-    const api = new SauceLabs({user: 'foo', key: 'bar', headless: true});
+    const api = new SauceLabs({user: 'foo', key: 'bar'});
     got.mockImplementation(() => {
       throw new Error('Endpoint not available!');
     });
@@ -528,7 +527,7 @@ describe('startSauceConnect', () => {
 
   it('should properly fail if connection could not be established', async () => {
     const errMessage = 'Sauce Connect could not establish a connection';
-    const api = new SauceLabs({user: 'foo', key: 'bar', headless: true});
+    const api = new SauceLabs({user: 'foo', key: 'bar'});
     setTimeout(() => stdoutEmitter.emit('data', errMessage), 50);
     const err = await api
       .startSauceConnect({
@@ -542,7 +541,7 @@ describe('startSauceConnect', () => {
 
   it('should properly fail if user is not authorized', async () => {
     const errMessage = 'Sauce Connect failed to start - 401 (Unauthorized).';
-    const api = new SauceLabs({user: 'foo', key: 'bar', headless: true});
+    const api = new SauceLabs({user: 'foo', key: 'bar'});
     setTimeout(() => stdoutEmitter.emit('data', errMessage), 50);
     const err = await api
       .startSauceConnect({
@@ -555,7 +554,7 @@ describe('startSauceConnect', () => {
   });
 
   it('should close sauce connect', async () => {
-    const api = new SauceLabs({user: 'foo', key: 'bar', headless: true});
+    const api = new SauceLabs({user: 'foo', key: 'bar'});
     setTimeout(
       () =>
         stdoutEmitter.emit(
@@ -577,7 +576,7 @@ describe('startSauceConnect', () => {
   });
 
   it('should fail if stderr is emitted', async () => {
-    const api = new SauceLabs({user: 'foo', key: 'bar', headless: true});
+    const api = new SauceLabs({user: 'foo', key: 'bar'});
     setTimeout(() => stderrEmitter.emit('data', 'Uuups'), 50);
     const res = await api
       .startSauceConnect({tunnelIdentifier: 'my-tunnel'})
@@ -586,7 +585,7 @@ describe('startSauceConnect', () => {
   });
 
   it('should not fail if stderr is expected character', async () => {
-    const api = new SauceLabs({user: 'foo', key: 'bar', headless: true});
+    const api = new SauceLabs({user: 'foo', key: 'bar'});
     setTimeout(() => stderrEmitter.emit('data', '\u001b[K'), 50);
     setTimeout(
       () =>

tests/typings/test.ts

@@ -5,7 +5,6 @@ const api = new SauceLabs({
   user: 'foo',
   key: 'foobar',
   proxy: 'barfoo',
-  headless: false,
 });
 
 async function foobar() {
@@ -27,7 +26,6 @@ async function foobar() {
   api.username.slice(1, 1);
   api.region.slice(1, 1);
   api.tld.slice(1, 1);
-  api.headless.valueOf();
   api.webdriverEndpoint.slice(1, 1);
 }
 

tests/utils.test.js

@@ -101,13 +101,12 @@ test('toString', () => {
     toString({
       username: 'foobar',
       _accessKey: '50fc1a11-3231-4240-9707-8f34682b17b0',
-      _options: {region: 'us', headless: false},
+      _options: {region: 'us'},
     })
   ).toBe(`SauceLabs API Client {
   username: 'foobar',
   key: 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXX2b17b0',
   region: 'us',
-  headless: false,
   proxy: undefined
 }`);
 });