From 409512d4e9acac72d57dd6002c3c8e6d9bf7ca60 Mon Sep 17 00:00:00 2001
From: Jason Leyba <jmleyba@gmail.com>
Date: Thu, 16 Oct 2014 16:55:53 -0700
Subject: [PATCH] Fix wait error messages.

---
 javascript/webdriver/until.js     | 2 +-
 javascript/webdriver/webdriver.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/javascript/webdriver/until.js b/javascript/webdriver/until.js
index b2e7dd2ec127f..717a0b9ec915e 100644
--- a/javascript/webdriver/until.js
+++ b/javascript/webdriver/until.js
@@ -64,7 +64,7 @@ var until = webdriver.until;
  */
 until.Condition = function(message, fn) {
   /** @private {string} */
-  this.description_ = message;
+  this.description_ = 'Waiting ' + message;
 
   /** @type {function(!webdriver.WebDriver): OUT} */
   this.fn = fn;
diff --git a/javascript/webdriver/webdriver.js b/javascript/webdriver/webdriver.js
index 07a39d2387a3d..2635805cc308b 100644
--- a/javascript/webdriver/webdriver.js
+++ b/javascript/webdriver/webdriver.js
@@ -648,7 +648,7 @@ webdriver.WebDriver.prototype.wait = function(
       return webdriver.promise.consume(fn, null, [driver]);
     }
     return fn(driver);
-  }, timeout, opt_message);
+  }, timeout, message);
 };