capybara-ng 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c4f7c97f4ebf5e71648c057da7f82f731d98971
-  data.tar.gz: 8dcf57346e76e4d7ec6635ae4dc0748817887419
+  metadata.gz: be1d09148071e01a094f2a9cbecb642c95bb81ea
+  data.tar.gz: d85deb17586269edd02764448aee3030e8007e45
 SHA512:
-  metadata.gz: 10abab89dedd87d0044ffa7daa3c7273ad56993849fff02f3305a57453ccb7fb2d4a2ead7366cfca9224c715e6a6b25aac7b7c3fc8e89217c3aec364e8bfeb19
-  data.tar.gz: c468da66a5426bc55c4c4d93d4e258aeb1ac0dc7b2a834b1a8c7721f3965740c22bc7257558e1b972e7538b632b605fe31283797e7d264f817c4f773020a4a4e
+  metadata.gz: 0db1d7f3ccb9ff4818587aa70c5d10dce59ea8be95b09fce0ae7495ad0df9426ff4e587b46a30b3056e26bdd55acda050329d5f8e359ff2e7e2c0c9d006736e8
+  data.tar.gz: 99f180ad70ad9583c23038aeff5571264979820abbc5b9298b448521c602309d0976292f167e483efd6755e40abd46cd3b0cc8cd73381f4a245caa15eabc5ce4

data/lib/angular/client_script.rb

@@ -1,28 +1,11 @@
 module Angular
 module ClientScript
-# /**
-#  * Wait until Angular has finished rendering and has
-#  * no outstanding $http calls before continuing.
-#  *
-#  * Asynchronous.
-#  *
-#  * @param {string} selector The selector housing an ng-app
-#  * @param {function} callback callback
-#  */
-  FN_waitForAngular = <<-FN
-function(selector, callback) {
-  var el = document.querySelector(selector);
-  return el;
-  try {
-    if (angular.getTestability) {
-      angular.getTestability(el).whenStable(callback);
-    } else {
-      angular.element(el).injector().get('$browser').
-          notifyWhenNoOutstandingRequests(callback);
-    }
-  } catch (e) {
-    callback(e);
-  }
+#
+# Log calls
+#
+  FN_nglog = <<-FN
+function(method, params) {
+  console.log('NG: ' + method + '(' + params.join(', ') + ')')
 };
 FN
 
@@ -38,6 +21,8 @@ FN
 #  */
   FN_findBindings = <<-FN
 function(binding, exactMatch, using, rootSelector) {
+  nglog("findBindings", [binding, exactMatch, using, rootSelector]);
+
   rootSelector = rootSelector || 'body';
   using = using || document.querySelector(rootSelector);
 
@@ -81,6 +66,8 @@ FN
 #  */
   FN_findBindingsIds = <<-FN
 function(binding, exactMatch, using, rootSelector) {
+  nglog("findBindingsIds", [binding, exactMatch, using, rootSelector]);
+
   var elements = findBindings(binding, exactMatch, using, rootSelector);
   return createCapybaraNgMatches(elements);
 };
@@ -101,6 +88,8 @@ FN
 #  */
   FN_findRepeaterRows = <<-FN
 function(repeater, index, using, rootSelector) {
+  console.log("findRepeaterRows", repeater, index, using, rootSelector);
+
   rootSelector = rootSelector || 'body';
   using = using || document.querySelector(rootSelector);
 
@@ -157,6 +146,8 @@ FN
 #  */
   FN_findRepeaterRowsIds = <<-FN
 function(repeater, index, using, rootSelector) {
+  nglog("findRepeaterRowsIds", [repeater, index, using, rootSelector]);
+
   var elements = findRepeaterRows(repeater, index, using, rootSelector);
   return createCapybaraNgMatches(elements);
 };
@@ -173,6 +164,8 @@ FN
  # */
   FN_findAllRepeaterRows = <<-FN
 function(repeater, using, rootSelector) {
+  nglog("findAllRepeaterRows", [repeater, using, rootSelector]);
+
   rootSelector = rootSelector || 'body';
   using = using || document.querySelector(rootSelector);
 
@@ -220,6 +213,8 @@ FN
  # */
   FN_findAllRepeaterRowsIds = <<-FN
 function(repeater, using, rootSelector) {
+  nglog("findAllRepeaterRowsIds", [repeater, using, rootSelector]);
+
   var elements = findAllRepeaterRows(repeater, using, rootSelector);
   return createCapybaraNgMatches(elements);
 };
@@ -238,6 +233,8 @@ FN
 #  */
   FN_findRepeaterElement = <<-FN
 function(repeater, index, binding, using, rootSelector) {
+  nglog("findRepeaterElement", [repeater, index, binding, using, rootSelector]);
+
   var matches = [];
   rootSelector = rootSelector || 'body';
   using = using || document.querySelector(rootSelector);
@@ -338,6 +335,8 @@ FN
 #  */
   FN_findRepeaterElementIds = <<-FN
 function(repeater, index, binding, using, rootSelector) {
+  nglog("findRepeaterElementIds", [repeater, index, binding, using, rootSelector]);
+
   var elements = findRepeaterElement(repeater, index, binding, using, rootSelector);
   return createCapybaraNgMatches(elements);
 };
@@ -355,6 +354,8 @@ FN
 #  */
   FN_findRepeaterColumn = <<-FN
 function(repeater, binding, using, rootSelector) {
+  nglog("findRepeaterColumn", [repeater, binding, using, rootSelector]);
+
   var matches = [];
   rootSelector = rootSelector || 'body';
   using = using || document.querySelector(rootSelector);
@@ -452,6 +453,8 @@ FN
 #  */
   FN_findRepeaterColumnIds = <<-FN
 function(repeater, binding, using, rootSelector) {
+  nglog("findRepeaterColumnIds", [repeater, binding, using, rootSelector]);
+
   var elements = findRepeaterColumn(repeater, binding, using, rootSelector);
   return createCapybaraNgMatches(elements);
 };
@@ -468,6 +471,8 @@ FN
 #  */
   FN_findByModel = <<-FN
 function(model, using, rootSelector) {
+  nglog("findByModel", [model, using, rootSelector]);
+
   rootSelector = rootSelector || 'body';
   using = using || document.querySelector(rootSelector);
 
@@ -498,6 +503,8 @@ FN
 #  */
   FN_findByModelIds = <<-FN
 function(model, using, rootSelector) {
+  nglog("findByModelIds", [model, using, rootSelector]);
+
   var elements = findByModel(model, using, rootSelector);
   return createCapybaraNgMatches(elements);
 };
@@ -515,6 +522,8 @@ FN
 #  */
   FN_findByOptions = <<-FN
 function(optionsDescriptor, using, rootSelector) {
+  nglog("findByOptions", [optionsDescriptor, using, rootSelector]);
+
   rootSelector = rootSelector || 'body';
   using = using || document.querySelector(rootSelector);
 
@@ -541,6 +550,8 @@ FN
 #  */
   FN_findByOptionsIds = <<-FN
 function(optionsDescriptor, using, rootSelector) {
+  nglog("findByOptionsIds", [optionsDescriptor, using, rootSelector]);
+
   var elements = findByOptions(optionsDescriptor, using, rootSelector);
   return createCapybaraNgMatches(elements);
 };
@@ -557,6 +568,8 @@ FN
 #  */
   FN_findByButtonText = <<-FN
 function(searchText, using, rootSelector) {
+  nglog("findByButtonText", [searchText, using, rootSelector]);
+
   rootSelector = rootSelector || 'body';
   using = using || document.querySelector(rootSelector);
 
@@ -590,6 +603,8 @@ FN
 #  */
   FN_findByPartialButtonText = <<-FN
 function(searchText, using, rootSelector) {
+  nglog("findByPartialButtonText", [searchText, using, rootSelector]);
+
   rootSelector = rootSelector || 'body';
   using = using || document.querySelector(rootSelector);
 
@@ -624,6 +639,8 @@ FN
 #  */
   FN_findByCssContainingText = <<-FN
 function(cssSelector, searchText, using, rootSelector) {
+  nglog("findByCssContainingText", [cssSelector, searchText, using, rootSelector]);
+
   rootSelector = rootSelector || 'body';
   using = using || document.querySelector(rootSelector);
 
@@ -651,6 +668,8 @@ FN
 #  */
   FN_testForAngular = <<-FN
 function(attempts, asyncCallback) {
+  nglog("testForAngular", [attempts, asyncCallback]);
+
   var callback = function(args) {
     setTimeout(function() {
       asyncCallback(args);
@@ -687,12 +706,16 @@ FN
 #  */
   FN_evaluate = <<-FN
 function(element, expression) {
+  nglog("evaluate", [element, expression]);
+
   return angular.element(element).scope().$eval(expression);
 };
 FN
 
   FN_allowAnimations = <<-FN
 function(element, value) {
+  nglog("allowAnimations", [element, value]);
+
   var ngElement = angular.element(element);
   if (ngElement.allowAnimations) {
     // AngularDart: $testability API.
@@ -712,6 +735,8 @@ FN
 #  */
   FN_getLocationAbsUrl = <<-FN
 function(selector) {
+  nglog("getLocationAbsUrl", [selector]);
+
   var el = document.querySelector(selector);
   if (angular.getTestability) {
     return angular.getTestability(el).
@@ -730,6 +755,8 @@ FN
 #  */
   FN_getLocation = <<-FN
 function(selector) {
+  nglog("getLocation", [selector]);
+
   var el = document.querySelector(selector);
   var $injector = angular.element(el).injector();
   var $location = $injector.get('$location');
@@ -746,6 +773,8 @@ FN
 #  */
   FN_setLocation = <<-FN
 function(selector, url) {
+  nglog("setLocation", [selector, url]);
+
   var el = document.querySelector(selector);
   if (angular.getTestability) {
     return angular.getTestability(el).

data/lib/angular/version.rb

@@ -1,3 +1,3 @@
 module Angular
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/angular/waiter.rb

@@ -38,6 +38,10 @@ module Angular
 
           window.ngReady = false;
 
+          window. nglog = function(method, params) {
+            console.log('NG: ' + method + '(' + params.join(', ') + ')')
+          };
+
           window.nextCapybaraId = function() {
             window.capybaraId = window.capybaraId || 1;
             return window.capybaraId++;
@@ -73,16 +77,20 @@ module Angular
           var app = angular.element(el);
           var injector = app.injector();
           var callback = function() {
+            nglog("ready", []);
             window.ngReady = true;
           };
 
           try {
             if (angular.getTestability) {
+              nglog("getTestability", [el]);
               angular.getTestability(el).whenStable(callback);
             } else {
+              nglog("$browser", [el]);
               injector.get('$browser').notifyWhenNoOutstandingRequests(callback);
             }
           } catch (e) {
+            nglog("callback failed", [e]);
             callback(e);
           }
         })();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-ng
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - kari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,10 +70,7 @@ files:
 - lib/angular.rb
 - lib/angular/capybara_setup.rb
 - lib/angular/client_script.rb
-- lib/angular/driver.rb
 - lib/angular/dsl.rb
-- lib/angular/element_helper.rb
-- lib/angular/locator.rb
 - lib/angular/log.rb
 - lib/angular/setup.rb
 - lib/angular/version.rb

data/lib/angular/driver.rb

@@ -1,357 +0,0 @@
-module Angular
-#
-# TODO KI NOT USED
-#
-class Driver
-  include Capybara::DSL
-
-  DEFER_LABEL = 'NG_DEFER_BOOTSTRAP!';
-
-  WEB_ELEMENT_FUNCTIONS = [
-    'click', 'sendKeys', 'getTagName', 'getCssValue', 'getAttribute', 'getText',
-    'getSize', 'getLocation', 'isEnabled', 'isSelected', 'submit', 'clear',
-    'isDisplayed', 'getOuterHtml', 'getInnerHtml', 'getId'
-  ]
-
-  DEFAULT_RESET_URL = 'data:text/html,<html></html>'
-  DEFAULT_GET_PAGE_TIMEOUT = 10000
-
-
-  def initialize(opt)
-    @element = ElementHelper.new(self)
-
-    # All get methods will be resolved against this base URL. Relative URLs are =
-    # resolved the way anchor tags resolve.
-    #
-    # @type {string}
-    @baseUrl = opt[:base_url] || '';
-
-    #
-    # The css selector for an element on which to find Angular. This is usually
-    # 'body' but if your ng-app is on a subsection of the page it may be
-    # a subelement.
-    #
-    # @type {string}
-    @rootEl = opt[:root_element] || 'body';
-
-    #
-    # If true, Protractor will not attempt to synchronize with the page before
-    # performing actions. This can be harmful because Protractor will not wait
-    # until $timeouts and $http calls have been processed, which can cause
-    # tests to become flaky. This should be used only when necessary, such as
-    # when a page continuously polls an API using $timeout.
-    #
-    # @type {boolean}
-    @ignoreSynchronization = false;
-
-    #
-    # Timeout in milliseconds to wait for pages to load when calling `get`.
-    #
-    # @type {number}
-    @getPageTimeout = DEFAULT_GET_PAGE_TIMEOUT;
-
-    #
-    # An object that holds custom test parameters.
-    #
-    # @type {Object}
-    @params = {};
-
-    #
-    # The reset URL to use between page loads.
-    #
-    # @type {string}
-    @resetUrl = DEFAULT_RESET_URL;
-
-    #
-    # Information about mock modules that will be installed during every
-    # get().
-    #
-    # @type {Array<{name: string, script: function|string, args: Array.<string>}>}
-    @mockModules = [];
-
-    @addBaseMockModules_();
-
-    @functions = ClientScript.functions
-  end
-
-  # @see http://artsy.github.io/blog/2012/02/03/reliably-testing-asynchronous-ui-w-slash-rspec-and-capybara/
-  def wait_for_dom(timeout = Capybara.default_wait_time)
-    uuid = SecureRandom.uuid
-    page.find("body")
-    page.evaluate_script <<-EOS
-    _.defer(function() {
-      $('body').append("<div id='#{uuid}'></div>");
-    });
-  EOS
-    page.find("##{uuid}")
-  end
-
-  def setup
-    <<-FN
-  // These functions should delegate to the webdriver instance, but should
-  // wait for Angular to sync up before performing the action. This does not
-  // include functions which are overridden by protractor below.
-  var methodsToSync = ['getCurrentUrl', 'getPageSource', 'getTitle'];
-
-  // Mix all other driver functionality into Protractor.
-  for (var method in webdriverInstance) {
-    if(!this[method] && typeof webdriverInstance[method] == 'function') {
-      if (methodsToSync.indexOf(method) !== -1) {
-        mixin(this, webdriverInstance, method, this.waitForAngular.bind(this));
-      } else {
-        mixin(this, webdriverInstance, method);
-      }
-    }
-  }
-FN
-  end
-
-  def page
-    Capybara.current_session
-  end
-
-  def wait_for_angular
-    return if @ignoreSynchronization
-    result = page.evaluate_script(functions[:waitForAngular])
-
-    <<-FN
-Protractor.prototype.waitForAngular = function() {
-  if (this.ignoreSynchronization) {
-    return webdriver.promise.fulfilled();
-  }
-  return this.driver.executeAsyncScript(
-    clientSideScripts.waitForAngular, this.rootEl).then(function(browserErr) {
-      if (browserErr) {
-        throw 'Error while waiting for Protractor to ' +
-              'sync with the page: ' + JSON.stringify(browserErr);
-      }
-    }).then(null, function(err) {
-      var timeout;
-      if (/asynchronous script timeout/.test(err.message)) {
-        // Timeout on Chrome
-        timeout = /-?[\d\.]*\ seconds/.exec(err.message);
-      } else if (/Timed out waiting for async script/.test(err.message)) {
-        // Timeout on Firefox
-        timeout = /-?[\d\.]*ms/.exec(err.message);
-      } else if (/Timed out waiting for an asynchronous script/.test(err.message)) {
-        // Timeout on Safari
-        timeout = /-?[\d\.]*\ ms/.exec(err.message);
-      }
-      if (timeout) {
-        throw 'Timed out waiting for Protractor to synchronize with ' +
-            'the page after ' + timeout + '. Please see ' +
-            'https://github.com/angular/protractor/blob/master/docs/faq.md';
-      } else {
-        throw err;
-      }
-    });
-};
-FN
-  end
-
-  def findElement
-    <<-FN
-/**
- * Waits for Angular to finish rendering before searching for elements.
- * @see webdriver.WebDriver.findElement
- * @return {!webdriver.WebElement}
- */
-function(locator) {
-  return this.element(locator).getWebElement();
-};
-FN
-  end
-
-  def findElements
-    <<-FN
-/**
- * Waits for Angular to finish rendering before searching for elements.
- * @see webdriver.WebDriver.findElements
- * @return {!webdriver.promise.Promise} A promise that will be resolved to an
- *     array of the located {@link webdriver.WebElement}s.
- */
-function(locator) {
-  return this.element.all(locator).getWebElements();
-};
-FN
-  end
-
-  def isElementPresent
-    <<-FN
-/**
- * Tests if an element is present on the page.
- * @see webdriver.WebDriver.isElementPresent
- * @return {!webdriver.promise.Promise} A promise that will resolve to whether
- *     the element is present on the page.
- */
-function(locatorOrElement) {
-  var element = (locatorOrElement instanceof webdriver.promise.Promise) ?
-      locatorOrElement : this.element(locatorOrElement);
-  return element.isPresent();
-};
-FN
-  end
-
-  def get
-    <<-FN
-/**
- * See webdriver.WebDriver.get
- *
- * Navigate to the given destination and loads mock modules before
- * Angular. Assumes that the page being loaded uses Angular.
- * If you need to access a page which does not have Angular on load, use
- * the wrapped webdriver directly.
- *
- * @param {string} destination Destination URL.
- * @param {number=} opt_timeout Number of milliseconds to wait for Angular to
- *     start.
- */
-function(destination, opt_timeout) {
-  var timeout = opt_timeout ? opt_timeout : this.getPageTimeout;
-  var self = this;
-
-  destination = this.baseUrl.indexOf('file://') === 0 ?
-    this.baseUrl + destination : url.resolve(this.baseUrl, destination);
-
-  if (this.ignoreSynchronization) {
-    return this.driver.get(destination);
-  }
-
-  this.driver.get(this.resetUrl);
-  this.driver.executeScript(
-      'window.name = "' + DEFER_LABEL + '" + window.name;' +
-      'window.location.replace("' + destination + '");');
-
-  // We need to make sure the new url has loaded before
-  // we try to execute any asynchronous scripts.
-  this.driver.wait(function() {
-    return self.driver.executeScript('return window.location.href;').
-        then(function(url) {
-          return url !== self.resetUrl;
-        }, function(err) {
-          if (err.code == 13) {
-            // Ignore the error, and continue trying. This is because IE
-            // driver sometimes (~1%) will throw an unknown error from this
-            // execution. See https://github.com/angular/protractor/issues/841
-            // This shouldn't mask errors because it will fail with the timeout
-            // anyway.
-            return false;
-          } else {
-            throw err;
-          }
-        });
-  }, timeout,
-  'Timed out waiting for page to load after ' + timeout + 'ms');
-
-  // Make sure the page is an Angular page.
-  self.driver.executeAsyncScript(clientSideScripts.testForAngular,
-        Math.floor(timeout / 1000)).
-      then(function(angularTestResult) {
-        var hasAngular = angularTestResult[0];
-        if (!hasAngular) {
-          var message = angularTestResult[1];
-          throw new Error('Angular could not be found on the page ' +
-              destination + ' : ' + message);
-        }
-      }, function(err) {
-        throw 'Error while running testForAngular: ' + err.message;
-      });
-
-  // At this point, Angular will pause for us until angular.resumeBootstrap
-  // is called.
-  var moduleNames = [];
-  for (var i = 0; i < this.mockModules_.length; ++i) {
-    var mockModule = this.mockModules_[i];
-    var name = mockModule.name;
-    moduleNames.push(name);
-    var executeScriptArgs = [mockModule.script].concat(mockModule.args);
-    this.driver.executeScript.apply(this, executeScriptArgs).
-        then(null, function(err) {
-          throw 'Error while running module script ' + name +
-              ': ' + err.message;
-        });
-  }
-
-  return this.driver.executeScript(
-      'angular.resumeBootstrap(arguments[0]);',
-      moduleNames);
-};
-FN
-  end
-
-  def refresh
-    <<-FN
-/**
- * See webdriver.WebDriver.refresh
- *
- * Makes a full reload of the current page and loads mock modules before
- * Angular. Assumes that the page being loaded uses Angular.
- * If you need to access a page which does not have Angular on load, use
- * the wrapped webdriver directly.
- *
- * @param {number=} opt_timeout Number of seconds to wait for Angular to start.
- */
- = function(opt_timeout) {
-  var timeout = opt_timeout || 10;
-  var self = this;
-
-  if (self.ignoreSynchronization) {
-    return self.driver.navigate().refresh();
-  }
-
-  return self.driver.executeScript('return window.location.href').then(function(href) {
-    return self.get(href, timeout);
-  });
-};
-FN
-  end
-
-  def navigate
-    <<-FN
-/**
- * Mixin navigation methods back into the navigation object so that
- * they are invoked as before, i.e. driver.navigate().refresh()
- */
-function() {
-  var nav = this.driver.navigate();
-  mixin(nav, this, 'refresh');
-  return nav;
-};
-FN
-  end
-
-  def setLocation
-    <<-FN
-/**
- * Browse to another page using in-page navigation.
- *
- * @param {string} url In page URL using the same syntax as $location.url()
- * @returns {!webdriver.promise.Promise} A promise that will resolve once
- *    page has been changed.
- */
-function(url) {
-  this.waitForAngular();
-  return this.driver.executeScript(clientSideScripts.setLocation, this.rootEl, url)
-    .then(function(browserErr) {
-      if (browserErr) {
-        throw 'Error while navigating to \'' + url + '\' : ' +
-            JSON.stringify(browserErr);
-      }
-    });
-};
-FN
-  end
-
-  def getLocationAbsUrl
-<<-FN
-/**
- * Returns the current absolute url from AngularJS.
- */
-function() {
-  this.waitForAngular();
-  return this.driver.executeScript(clientSideScripts.getLocationAbsUrl, this.rootEl);
-};
-FN
-  end
-end
-end