feat(expectedConditions): adding urlIs and urlContains (#3237)

* adding urlIs and urlContains
* tests for UrlIs and UrlContains

lib/expectedConditions.ts

@@ -265,6 +265,49 @@ export class ExpectedConditions {
     };
   }
 
+  /**
+   * An expectation for checking that the URL contains a case-sensitive
+   * substring.
+   *
+   * @example
+   * var EC = protractor.ExpectedConditions;
+   * // Waits for the URL to contain 'foo'.
+   * browser.wait(EC.urlContains('foo'), 5000);
+   *
+   * @param {!string} url The fragment of URL expected
+   *
+   * @return {!function} An expected condition that returns a promise
+   *     representing whether the URL contains the string.
+   */
+  urlContains(url: string): Function {
+    return () => {
+      return protractor.browser.driver.getCurrentUrl().then(
+          (actualUrl: string): boolean => {
+            return actualUrl.indexOf(url) > -1;
+          });
+    };
+  }
+
+  /**
+   * An expectation for checking the URL of a page.
+   *
+   * @example
+   * var EC = protractor.ExpectedConditions;
+   * // Waits for the URL to be 'foo'.
+   * browser.wait(EC.urlIs('foo'), 5000);
+   *
+   * @param {!string} url The expected URL, which must be an exact match.
+   *
+   * @return {!function} An expected condition that returns a promise
+   *     representing whether the url equals the string.
+   */
+  urlIs(url: string): Function {
+    return () => {
+      return protractor.browser.driver.getCurrentUrl().then(
+          (actualUrl: string): boolean => { return actualUrl === url; });
+    };
+  }
+
   /**
    * An expectation for checking that an element is present on the DOM
    * of a page. This does not necessarily mean that the element is visible.

spec/basic/expected_conditions_spec.js

@@ -1,4 +1,5 @@
 var EC = protractor.ExpectedConditions;
+var env = require('../environment');
 
 describe('expected conditions', function() {
   beforeEach(function() {
@@ -66,6 +67,18 @@ describe('expected conditions', function() {
     expect(EC.titleIs('My AngularJS App').call()).toBe(true);
   });
 
+  it('should have urlContains', function() {
+      var baseUrlFromSpec = browser.baseUrl;
+      expect(EC.urlContains('/form').call()).toBe(true);
+      expect(EC.urlContains(baseUrlFromSpec+ 'index.html#/form').call()).toBe(true);
+  });
+
+  it('should have urlIs', function() {
+      var baseUrlFromSpec = browser.baseUrl;
+      expect(EC.urlIs(env.baseUrl).call()).toBe(false);
+      expect(EC.urlIs(baseUrlFromSpec+'index.html#/form').call()).toBe(true);
+  });
+
   it('should have elementToBeClickable', function() {
     var invalidIsClickable = EC.elementToBeClickable($('#INVALID'));
     var buttonIsClickable = EC.elementToBeClickable($('#disabledButton'));