selenium-webdriver 3.3.0 → 4.0.0-alpha.1

package/test/lib/http_test.js

@@ -118,7 +118,7 @@ describe('http', function() {
         });
       });
 
-      it('rejects commands missing URL parameters', function() {
+      it('rejects commands missing URL parameters', async function() {
         let command =
             new Command(CommandName.FIND_CHILD_ELEMENT).
                 setParameter('sessionId', 's123').
@@ -126,12 +126,13 @@ describe('http', function() {
                 setParameter('using', 'id').
                 setParameter('value', 'foo');
 
-        assert.throws(
-            () => executor.execute(command),
-            function(err) {
-              return err instanceof error.InvalidArgumentError
-                  && 'Missing required parameter: id' === err.message;
-            });
+        try {
+          await executor.execute(command);
+          return Promise.reject(Error('should have thrown'));
+        } catch (err) {
+          assert.strictEqual(err.constructor, error.InvalidArgumentError);
+          assert.equal(err.message, 'Missing required parameter: id');
+        }
         assert.ok(!send.called);
       });
 
@@ -153,14 +154,6 @@ describe('http', function() {
         beforeEach(() => executor = new http.Executor(client));
 
         describe('in legacy mode', function() {
-          test(CommandName.GET_WINDOW_SIZE, {sessionId:'s123'}, false,
-               'GET', '/session/s123/window/current/size');
-
-          test(CommandName.SET_WINDOW_SIZE,
-               {sessionId:'s123', width: 1, height: 1}, false,
-               'POST', '/session/s123/window/current/size',
-               {width: 1, height: 1});
-
           test(CommandName.MAXIMIZE_WINDOW, {sessionId:'s123'}, false,
                'POST', '/session/s123/window/current/maximize');
 
@@ -171,14 +164,6 @@ describe('http', function() {
         });
 
         describe('in W3C mode', function() {
-          test(CommandName.GET_WINDOW_SIZE,
-               {sessionId:'s123'}, true,
-               'GET', '/session/s123/window/size');
-
-          test(CommandName.SET_WINDOW_SIZE,
-               {sessionId:'s123', width: 1, height: 1}, true,
-               'POST', '/session/s123/window/size', {width: 1, height: 1});
-
           test(CommandName.MAXIMIZE_WINDOW, {sessionId:'s123'}, true,
                'POST', '/session/s123/window/maximize');
 
@@ -293,7 +278,14 @@ describe('http', function() {
         });
 
         it('auto-upgrades on W3C response', function() {
-          var rawResponse = {sessionId: 's123', value: {name: 'Bob'}};
+          let rawResponse = {
+            value: {
+              sessionId: 's123',
+              value: {
+                name: 'Bob'
+              }
+            }
+          };
 
           send.returns(Promise.resolve(
               new http.Response(200, {}, JSON.stringify(rawResponse))));
@@ -344,7 +336,8 @@ describe('http', function() {
         });
 
         it('handles w3c new session failures', function() {
-          let rawResponse = {error: 'no such element', message: 'oops'};
+          let rawResponse =
+              {value: {error: 'no such element', message: 'oops'}};
 
           send.returns(Promise.resolve(
               new http.Response(500, {}, JSON.stringify(rawResponse))));
@@ -358,111 +351,6 @@ describe('http', function() {
         });
       });
 
-      describe('extracts Session from DESCRIBE_SESSION response', function() {
-        let command;
-
-        beforeEach(function() {
-          executor = new http.Executor(client);
-          command = new Command(CommandName.DESCRIBE_SESSION)
-              .setParameter('sessionId', 'foo');
-        });
-
-        describe('fails if server returns invalid response', function() {
-          describe('(empty response)', function() {
-            test(true);
-            test(false);
-
-            function test(w3c) {
-              it('w3c === ' + w3c, function() {
-                send.returns(Promise.resolve(new http.Response(200, {}, '')));
-                executor.w3c = w3c;
-                return executor.execute(command).then(
-                    () => assert.fail('expected to fail'),
-                    (e) => {
-                      if (!e.message.startsWith('Unable to parse')) {
-                        throw e;
-                      }
-                    });
-              });
-            }
-          });
-
-          describe('(no session ID)', function() {
-            test(true);
-            test(false);
-
-            function test(w3c) {
-              it('w3c === ' + w3c, function() {
-                let resp = {value:{name: 'Bob'}};
-                send.returns(Promise.resolve(
-                    new http.Response(200, {}, JSON.stringify(resp))));
-                executor.w3c = w3c;
-                return executor.execute(command).then(
-                    () => assert.fail('expected to fail'),
-                    (e) => {
-                      if (!e.message.startsWith('Unable to parse')) {
-                        throw e;
-                      }
-                    });
-              });
-            }
-          });
-        });
-
-        it('handles legacy response', function() {
-          var rawResponse = {sessionId: 's123', status: 0, value: {name: 'Bob'}};
-
-          send.returns(Promise.resolve(
-              new http.Response(200, {}, JSON.stringify(rawResponse))));
-
-          assert.ok(!executor.w3c);
-          return executor.execute(command).then(function(response) {
-            assert.ok(response instanceof Session);
-            assert.equal(response.getId(), 's123');
-
-            let caps = response.getCapabilities();
-            assert.ok(caps instanceof Capabilities);
-            assert.equal(caps.get('name'), 'Bob');
-
-            assert.ok(!executor.w3c);
-          });
-        });
-
-        it('does not auto-upgrade on W3C response', function() {
-          var rawResponse = {sessionId: 's123', value: {name: 'Bob'}};
-
-          send.returns(Promise.resolve(
-              new http.Response(200, {}, JSON.stringify(rawResponse))));
-
-          assert.ok(!executor.w3c);
-          return executor.execute(command).then(function(response) {
-            assert.ok(response instanceof Session);
-            assert.equal(response.getId(), 's123');
-
-            let caps = response.getCapabilities();
-            assert.ok(caps instanceof Capabilities);
-            assert.equal(caps.get('name'), 'Bob');
-
-            assert.ok(!executor.w3c);
-          });
-        });
-
-        it('if w3c, does not downgrade on legacy response', function() {
-          var rawResponse = {sessionId: 's123', status: 0, value: null};
-
-          send.returns(Promise.resolve(
-              new http.Response(200, {}, JSON.stringify(rawResponse))));
-
-          executor.w3c = true;
-          return executor.execute(command).then(function(response) {
-            assert.ok(response instanceof Session);
-            assert.equal(response.getId(), 's123');
-            assert.equal(response.getCapabilities().size, 0);
-            assert.ok(executor.w3c, 'should never downgrade');
-          });
-        });
-      });
-
       it('handles JSON null', function() {
         var command = new Command(CommandName.GET_CURRENT_URL)
             .setParameter('sessionId', 's123');