selenium-webdriver 2.48.2 → 2.53.3

package/test/chrome/options_test.js

@@ -21,6 +21,7 @@ var fs = require('fs');
 
 var webdriver = require('../..'),
     chrome = require('../../chrome'),
+    symbols = require('../../lib/symbols'),
     proxy = require('../../proxy'),
     assert = require('../../testing/assert');
 
@@ -28,7 +29,6 @@ var test = require('../../lib/test');
 
 
 describe('chrome.Options', function() {
-
   describe('fromCapabilities', function() {
 
     it('should return a new Options instance if none were defined',
@@ -58,7 +58,7 @@ describe('chrome.Options', function() {
       });
 
       var options = chrome.Options.fromCapabilities(caps);
-      var json = options.serialize();
+      var json = options[symbols.serialize]();
 
       assert(json.args.length).equalTo(2);
       assert(json.args[0]).equalTo('a');
@@ -79,7 +79,7 @@ describe('chrome.Options', function() {
           });
 
           var options = chrome.Options.fromCapabilities(caps);
-          var json = options.serialize();
+          var json = options[symbols.serialize]();
           assert(json.args).isUndefined();
           assert(json.binary).isUndefined();
           assert(json.detach).isUndefined();
@@ -109,10 +109,10 @@ describe('chrome.Options', function() {
   describe('addArguments', function() {
     it('takes var_args', function() {
       var options = new chrome.Options();
-      assert(options.serialize().args).isUndefined();
+      assert(options[symbols.serialize]().args).isUndefined();
 
       options.addArguments('a', 'b');
-      var json = options.serialize();
+      var json = options[symbols.serialize]();
       assert(json.args.length).equalTo(2);
       assert(json.args[0]).equalTo('a');
       assert(json.args[1]).equalTo('b');
@@ -120,10 +120,10 @@ describe('chrome.Options', function() {
 
     it('flattens input arrays', function() {
       var options = new chrome.Options();
-      assert(options.serialize().args).isUndefined();
+      assert(options[symbols.serialize]().args).isUndefined();
 
       options.addArguments(['a', 'b'], 'c', [1, 2], 3);
-      var json = options.serialize();
+      var json = options[symbols.serialize]();
       assert(json.args.length).equalTo(6);
       assert(json.args[0]).equalTo('a');
       assert(json.args[1]).equalTo('b');
@@ -163,7 +163,9 @@ describe('chrome.Options', function() {
   describe('serialize', function() {
     it('base64 encodes extensions', function() {
       var expected = fs.readFileSync(__filename, 'base64');
-      var wire = new chrome.Options().addExtensions(__filename).serialize();
+      var wire = new chrome.Options()
+          .addExtensions(__filename)
+          [symbols.serialize]();
       assert(wire.extensions.length).equalTo(1);
       assert(wire.extensions[0]).equalTo(expected);
     });
@@ -222,4 +224,4 @@ test.suite(function(env) {
       assert(userAgent).equalTo('foo;bar');
     });
   });
-}, {browsers: ['chrome']});
+}, {browsers: ['chrome']});

package/test/element_finding_test.js

@@ -23,6 +23,7 @@ var Browser = require('..').Browser,
     By = require('..').By,
     error = require('..').error,
     until = require('..').until,
+    promise = require('../lib/promise'),
     test = require('../lib/test'),
     assert = require('../testing/assert'),
     Pages = test.Pages;
@@ -42,7 +43,6 @@ test.suite(function(env) {
   });
 
   describe('finding elements', function() {
-
     test.it(
         'should work after loading multiple pages in a row',
         function() {
@@ -63,7 +63,7 @@ test.suite(function(env) {
         driver.get(Pages.formPage);
         driver.findElement(By.id('nonExistantButton')).
             then(fail, function(e) {
-              assert(e.code).equalTo(error.ErrorCode.NO_SUCH_ELEMENT);
+              assert(e).instanceOf(error.NoSuchElementError);
             });
       });
 
@@ -86,11 +86,12 @@ test.suite(function(env) {
       });
 
       test.it(
-        'should be able to find elements by partial link text', function() {
-          driver.get(Pages.xhtmlTestPage);
-          driver.findElement(By.partialLinkText('ick me')).click();
-          driver.wait(until.titleIs('We Arrive Here'), 5000);
-        });
+          'should be able to find elements by partial link text',
+          function() {
+            driver.get(Pages.xhtmlTestPage);
+            driver.findElement(By.partialLinkText('ick me')).click();
+            driver.wait(until.titleIs('We Arrive Here'), 5000);
+          });
 
       test.it('should work when link text contains equals sign', function() {
         driver.get(Pages.xhtmlTestPage);
@@ -230,7 +231,7 @@ test.suite(function(env) {
         driver.get(Pages.xhtmlTestPage);
         driver.findElement(By.className('nameB')).
             then(fail, function(e) {
-              assert(e.code).equalTo(error.ErrorCode.NO_SUCH_ELEMENT);
+              assert(e).instanceOf(error.NoSuchElementError);
             });
       });
 
@@ -241,11 +242,11 @@ test.suite(function(env) {
         });
       });
 
-      test.it('does not permit compound class names', function() {
-        driver.get(Pages.xhtmlTestPage);
-        driver.findElement(By.className('a b')).then(fail, pass);
-        driver.findElements(By.className('a b')).then(fail, pass);
-        function pass() {}
+      test.it('permits compound class names', function() {
+        return driver.get(Pages.xhtmlTestPage)
+            .then(() => driver.findElement(By.className('nameA nameC')))
+            .then(el => el.getText())
+            .then(text => assert(text).equalTo('An H2 title'));
       });
     });
 
@@ -350,5 +351,42 @@ test.suite(function(env) {
             assert(el.getAttribute('value')).equalTo('two');
           });
     });
+
+    describe('by custom locator', function() {
+      test.it('handles single element result', function() {
+        driver.get(Pages.javascriptPage);
+
+        let link = driver.findElement(function(driver) {
+          let links = driver.findElements(By.tagName('a'));
+          return promise.filter(links, function(link) {
+            return link.getAttribute('id').then(id => id === 'updatediv');
+          }).then(links => links[0]);
+        });
+
+        assert(link.getText()).isEqualTo('Update a div');
+      });
+
+      test.it('uses first element if locator resolves to list', function() {
+        driver.get(Pages.javascriptPage);
+
+        let link = driver.findElement(function() {
+          return driver.findElements(By.tagName('a'));
+        });
+
+        assert(link.getText()).isEqualTo('Change the page title!');
+      });
+
+      test.it('fails if locator returns non-webelement value', function() {
+        driver.get(Pages.javascriptPage);
+
+        let link = driver.findElement(function() {
+          return driver.getTitle();
+        });
+
+        return link.then(
+            () => fail('Should have failed'),
+            (e) => assert(e).instanceOf(TypeError));
+      });
+    });
   });
 });

package/test/execute_script_test.js

@@ -47,7 +47,7 @@ test.suite(function(env) {
     test.it('fails if script throws', function() {
       execute('throw new Error("boom")')
           .then(function() { throw shoudlHaveFailed; })
-          .thenCatch(function(e) {
+          .catch(function(e) {
             // The java WebDriver server adds a bunch of crap to error messages.
             // Error message will just be "JavaScript error" for IE.
             assert(e.message).matches(/.*(JavaScript error|boom).*/);
@@ -57,8 +57,8 @@ test.suite(function(env) {
     test.it('fails if script does not parse', function() {
       execute('throw function\\*')
           .then(function() { throw shoudlHaveFailed; })
-          .thenCatch(function(e) {
-            assert(e).not.equalTo(shouldHaveFailed);
+          .catch(function(e) {
+            assert(e).notEqualTo(shouldHaveFailed);
           });
     });
 
@@ -308,6 +308,20 @@ test.suite(function(env) {
       });
     });
 
+    describe('getInnerHtml', function() {
+      test.it('returns element innerHTML using executeScript', function() {
+        let html = driver.findElement(By.css('div.request')).getInnerHtml();
+        assert(html).equalTo('GET /common/echo HTTP/1.1');
+      });
+    });
+
+    describe('getOuterHtml', function() {
+      test.it('returns element outerHTML using executeScript', function() {
+        let html = driver.findElement(By.css('div.request')).getOuterHtml();
+        assert(html)
+            .equalTo('<div class="request">GET /common/echo HTTP/1.1</div>');
+      });
+    });
   });
 
   function verifyJson(expected) {

package/test/firefox/firefox_test.js

@@ -124,38 +124,6 @@ test.suite(function(env) {
       }
     });
 
-    describe('profile management', function() {
-      var driver;
-
-      test.beforeEach(function() {
-        driver = null;
-      });
-
-      test.afterEach(function() {
-        if (driver) {
-          driver.quit();
-        }
-      });
-
-      test.ignore(env.isRemote).
-      it('deletes the temp profile on quit', function() {
-        driver = env.builder().build();
-
-        var profilePath = driver.call(function() {
-          var path = driver.profilePath_;
-          assert(io.exists(path)).isTrue();
-          return path;
-        });
-
-        return driver.quit().then(function() {
-          driver = null;
-          return profilePath;
-        }).then(function(path) {
-          assert(io.exists(path)).isFalse();
-        });
-      });
-    });
-
     describe('binary management', function() {
       var driver1, driver2;