mkuklis-webrat 0.5.1 → 0.6.rc1

data/lib/webrat/selenium/application_servers/external.rb

@@ -1,26 +1,26 @@
-require "webrat/selenium/application_servers/base"
-
-module Webrat
-  module Selenium
-    module ApplicationServers
-      class External < Webrat::Selenium::ApplicationServers::Base
-        def start
-          warn "Webrat Ignoring Start Of Application Server Due to External Mode"
-        end
-
-        def stop
-        end
-
-        def fail
-        end
-
-        def pid_file
-        end
-
-        def wait
-        end
-
-      end
-    end
-  end
-end
+require "webrat/selenium/application_servers/base"
+
+module Webrat
+  module Selenium
+    module ApplicationServers
+      class External < Webrat::Selenium::ApplicationServers::Base
+        def start
+          warn "Webrat Ignoring Start Of Application Server Due to External Mode"
+        end
+
+        def stop
+        end
+
+        def fail
+        end
+
+        def pid_file
+        end
+
+        def wait
+        end
+
+      end
+    end
+  end
+end

data/lib/webrat/selenium/application_servers/merb.rb

@@ -1,50 +1,50 @@
-require "webrat/selenium/application_servers/base"
-
-module Webrat
-  module Selenium
-    module ApplicationServers
-      class Merb < Webrat::Selenium::ApplicationServers::Base
-
-        def start
-          system start_command
-        end
-
-        def stop
-          silence_stream(STDOUT) do
-            pid = File.read(pid_file)
-            system("kill -9 #{pid}")
-            FileUtils.rm_f pid_file
-          end
-        end
-
-        def fail
-          $stderr.puts
-          $stderr.puts
-          $stderr.puts "==> Failed to boot the Merb application server... exiting!"
-          $stderr.puts
-          $stderr.puts "Verify you can start a Merb server on port #{Webrat.configuration.application_port} with the following command:"
-          $stderr.puts
-          $stderr.puts "    #{start_command}"
-          exit
-        end
-
-        def pid_file
-        "log/merb.#{Webrat.configuration.application_port}.pid"
-        end
-
-        def start_command
-        "#{merb_command} -d -p #{Webrat.configuration.application_port} -e #{Webrat.configuration.application_environment}"
-        end
-
-        def merb_command
-          if File.exist?('bin/merb')
-            merb_cmd = 'bin/merb'
-          else
-            merb_cmd = 'merb'
-          end
-        end
-
-      end
-    end
-  end
-end
+require "webrat/selenium/application_servers/base"
+
+module Webrat
+  module Selenium
+    module ApplicationServers
+      class Merb < Webrat::Selenium::ApplicationServers::Base
+
+        def start
+          system start_command
+        end
+
+        def stop
+          silence_stream(STDOUT) do
+            pid = File.read(pid_file)
+            system("kill -9 #{pid}")
+            FileUtils.rm_f pid_file
+          end
+        end
+
+        def fail
+          $stderr.puts
+          $stderr.puts
+          $stderr.puts "==> Failed to boot the Merb application server... exiting!"
+          $stderr.puts
+          $stderr.puts "Verify you can start a Merb server on port #{Webrat.configuration.application_port} with the following command:"
+          $stderr.puts
+          $stderr.puts "    #{start_command}"
+          exit
+        end
+
+        def pid_file
+        "log/merb.#{Webrat.configuration.application_port}.pid"
+        end
+
+        def start_command
+        "#{merb_command} -d -p #{Webrat.configuration.application_port} -e #{Webrat.configuration.application_environment}"
+        end
+
+        def merb_command
+          if File.exist?('bin/merb')
+            merb_cmd = 'bin/merb'
+          else
+            merb_cmd = 'merb'
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/webrat/selenium/application_servers/rails.rb

@@ -6,11 +6,7 @@ module Webrat
       class Rails < Webrat::Selenium::ApplicationServers::Base
 
         def start
-          if windows?
-            @shell.run remove_service, {:background => true }
-            @shell.run install_service, {:background => false }
-          end
-          @shell.run start_command, {:background => true}
+            @shell.run start_command, {:background => true}
         end
 
         def stop
@@ -47,9 +43,10 @@ module Webrat
         
         def start_command
           if windows?
+            @shell.run install_service, {:background => false }
             "net start testapp"
           else 
-            "mongrel_rails start -d --chdir='#{RAILS_ROOT}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file}"
+            "mongrel_rails start -d --chdir='#{RAILS_ROOT}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &"
           end
         end
 

data/lib/webrat/selenium/application_servers/sinatra.rb

@@ -1,37 +1,37 @@
-require "webrat/selenium/application_servers/base"
-
-module Webrat
-  module Selenium
-    module ApplicationServers
-      class Sinatra < Webrat::Selenium::ApplicationServers::Base
-
-        def start
-          fork do
-            File.open('rack.pid', 'w') { |fp| fp.write Process.pid }
-            exec 'rackup', File.expand_path(Dir.pwd + '/config.ru'), '-p', Webrat.configuration.application_port.to_s
-          end
-        end
-
-        def stop
-          silence_stream(STDOUT) do
-            pid = File.read(pid_file)
-            system("kill -9 #{pid}")
-            FileUtils.rm_f pid_file
-          end
-        end
-
-        def fail
-          $stderr.puts
-          $stderr.puts
-          $stderr.puts "==> Failed to boot the Sinatra application server... exiting!"
-          exit
-        end
-
-        def pid_file
-          prepare_pid_file(Dir.pwd, 'rack.pid')
-        end
-
-      end
-    end
-  end
-end
+require "webrat/selenium/application_servers/base"
+
+module Webrat
+  module Selenium
+    module ApplicationServers
+      class Sinatra < Webrat::Selenium::ApplicationServers::Base
+
+        def start
+          fork do
+            File.open('rack.pid', 'w') { |fp| fp.write Process.pid }
+            exec 'rackup', File.expand_path(Dir.pwd + '/config.ru'), '-p', Webrat.configuration.application_port.to_s
+          end
+        end
+
+        def stop
+          silence_stream(STDOUT) do
+            pid = File.read(pid_file)
+            system("kill -9 #{pid}")
+            FileUtils.rm_f pid_file
+          end
+        end
+
+        def fail
+          $stderr.puts
+          $stderr.puts
+          $stderr.puts "==> Failed to boot the Sinatra application server... exiting!"
+          exit
+        end
+
+        def pid_file
+          prepare_pid_file(Dir.pwd, 'rack.pid')
+        end
+
+      end
+    end
+  end
+end

data/lib/webrat/selenium/application_servers.rb

@@ -1,5 +1,5 @@
-require "webrat/selenium/application_servers/base"
-require "webrat/selenium/application_servers/sinatra"
-require "webrat/selenium/application_servers/merb"
-require "webrat/selenium/application_servers/rails"
-require "webrat/selenium/application_servers/external"
+require "webrat/selenium/application_servers/base"
+require "webrat/selenium/application_servers/sinatra"
+require "webrat/selenium/application_servers/merb"
+require "webrat/selenium/application_servers/rails"
+require "webrat/selenium/application_servers/external"

data/lib/webrat/selenium/location_strategy_javascript/button.js

@@ -1,19 +1,19 @@
-if (locator == '*') {
-  return selenium.browserbot.locationStrategies['xpath'].call(this, "//input[@type='submit']", inDocument, inWindow)
-}
-var buttons = inDocument.getElementsByTagName('button');
-var inputs = inDocument.getElementsByTagName('input');
-var result = $A(inputs).concat($A(buttons)).find(function(candidate){
-	var type = candidate.getAttribute('type');
-	if (type == 'submit' || type == 'image'  || type == 'button') {
-		var matches_id = PatternMatcher.matches(locator, candidate.id);
-		var matches_value = PatternMatcher.matches(locator, candidate.value);
-		var matches_html = PatternMatcher.matches(locator, candidate.innerHTML);
-		var matches_alt = PatternMatcher.matches(locator, candidate.alt);
-		if (matches_id || matches_value || matches_html || matches_alt) {
-			return true;
-		}
-	}
-	return false;
-});
-return result;
+if (locator == '*') {
+  return selenium.browserbot.locationStrategies['xpath'].call(this, "//input[@type='submit']", inDocument, inWindow)
+}
+var buttons = inDocument.getElementsByTagName('button');
+var inputs = inDocument.getElementsByTagName('input');
+var result = $A(inputs).concat($A(buttons)).find(function(candidate){
+	var type = candidate.getAttribute('type');
+	if (type == 'submit' || type == 'image'  || type == 'button') {
+		var matches_id = PatternMatcher.matches(locator, candidate.id);
+		var matches_value = PatternMatcher.matches(locator, candidate.value);
+		var matches_html = PatternMatcher.matches(locator, candidate.innerHTML);
+		var matches_alt = PatternMatcher.matches(locator, candidate.alt);
+		if (matches_id || matches_value || matches_html || matches_alt) {
+			return true;
+		}
+	}
+	return false;
+});
+return result;

data/lib/webrat/selenium/location_strategy_javascript/label.js

@@ -1,42 +1,42 @@
-// Credit to: http://simonwillison.net/2006/Jan/20/escape/
-RegExp.escape = function(text) {
-  if (!arguments.callee.sRE) {
-    var specials = [
-      '/', '.', '*', '+', '?', '|',
-      '(', ')', '[', ']', '{', '}', '\\'
-    ];
-    arguments.callee.sRE = new RegExp(
-      '(\\' + specials.join('|\\') + ')', 'g'
-    );
-  }
-  return text.replace(arguments.callee.sRE, '\\$1');
-}
-
-var allLabels = inDocument.getElementsByTagName("label");
-var regExp = new RegExp('^\\W*' + RegExp.escape(locator) + '(\\b|$)', 'i');
-
-var candidateLabels = $A(allLabels).select(function(candidateLabel){
-  var labelText = getText(candidateLabel).strip();
-  return (labelText.search(regExp) >= 0);
-});
-
-if (candidateLabels.length == 0) {
-  return null;      
-}
-
-//reverse length sort
-candidateLabels = candidateLabels.sortBy(function(s) {
-  return s.length * -1;
-});
-
-var locatedLabel = candidateLabels.first();
-var labelFor = locatedLabel.getAttribute('for');
-
-if ((labelFor == null) && (locatedLabel.hasChildNodes())) {
-  return locatedLabel.getElementsByTagName('button')[0]
-    || locatedLabel.getElementsByTagName('input')[0]
-    || locatedLabel.getElementsByTagName('textarea')[0]
-    || locatedLabel.getElementsByTagName('select')[0];
-}
-
-return selenium.browserbot.locationStrategies['id'].call(this, labelFor, inDocument, inWindow);
+// Credit to: http://simonwillison.net/2006/Jan/20/escape/
+RegExp.escape = function(text) {
+  if (!arguments.callee.sRE) {
+    var specials = [
+      '/', '.', '*', '+', '?', '|',
+      '(', ')', '[', ']', '{', '}', '\\'
+    ];
+    arguments.callee.sRE = new RegExp(
+      '(\\' + specials.join('|\\') + ')', 'g'
+    );
+  }
+  return text.replace(arguments.callee.sRE, '\\$1');
+}
+
+var allLabels = inDocument.getElementsByTagName("label");
+var regExp = new RegExp('^\\W*' + RegExp.escape(locator) + '(\\b|$)', 'i');
+
+var candidateLabels = $A(allLabels).select(function(candidateLabel){
+  var labelText = getText(candidateLabel).strip();
+  return (labelText.search(regExp) >= 0);
+});
+
+if (candidateLabels.length == 0) {
+  return null;      
+}
+
+//reverse length sort
+candidateLabels = candidateLabels.sortBy(function(s) {
+  return s.length * -1;
+});
+
+var locatedLabel = candidateLabels.first();
+var labelFor = locatedLabel.getAttribute('for');
+
+if ((labelFor == null) && (locatedLabel.hasChildNodes())) {
+  return locatedLabel.getElementsByTagName('button')[0]
+    || locatedLabel.getElementsByTagName('input')[0]
+    || locatedLabel.getElementsByTagName('textarea')[0]
+    || locatedLabel.getElementsByTagName('select')[0];
+}
+
+return selenium.browserbot.locationStrategies['id'].call(this, labelFor, inDocument, inWindow);

data/lib/webrat/selenium/location_strategy_javascript/webrat.js

@@ -1,6 +1,6 @@
-var locationStrategies = selenium.browserbot.locationStrategies;
-
-return locationStrategies['id'].call(this, locator, inDocument, inWindow)
-        || locationStrategies['name'].call(this, locator, inDocument, inWindow)
-        || locationStrategies['label'].call(this, locator, inDocument, inWindow)
-        || null;
+var locationStrategies = selenium.browserbot.locationStrategies;
+
+return locationStrategies['id'].call(this, locator, inDocument, inWindow)
+        || locationStrategies['name'].call(this, locator, inDocument, inWindow)
+        || locationStrategies['label'].call(this, locator, inDocument, inWindow)
+        || null;

data/lib/webrat/selenium/location_strategy_javascript/webratlink.js

@@ -1,32 +1,32 @@
-var links = inDocument.getElementsByTagName('a');
-
-var candidateLinks = $A(links).select(function(candidateLink) {
-  var textMatched = false;
-  var titleMatched = false;
-  var idMatched = false;
-
-  if (getText(candidateLink).toLowerCase().indexOf(locator.toLowerCase()) != -1) {
-    textMatched = true;
-  }
-
-  if (candidateLink.title.toLowerCase().indexOf(locator.toLowerCase()) != -1) {
-    titleMatched = true;
-  }
-
-  if (candidateLink.id.toLowerCase().indexOf(locator.toLowerCase()) != -1) {
-    idMatched = true;
-  }
-
-  return textMatched || idMatched || titleMatched;
-});
-
-if (candidateLinks.length == 0) {
-  return null;
-}
-
-//reverse length sort
-candidateLinks = candidateLinks.sortBy(function(s) {
-  return s.length * -1;
-});
-
-return candidateLinks.first();
+var links = inDocument.getElementsByTagName('a');
+
+var candidateLinks = $A(links).select(function(candidateLink) {
+  var textMatched = false;
+  var titleMatched = false;
+  var idMatched = false;
+
+  if (getText(candidateLink).toLowerCase().indexOf(locator.toLowerCase()) != -1) {
+    textMatched = true;
+  }
+
+  if (candidateLink.title.toLowerCase().indexOf(locator.toLowerCase()) != -1) {
+    titleMatched = true;
+  }
+
+  if (candidateLink.id.toLowerCase().indexOf(locator.toLowerCase()) != -1) {
+    idMatched = true;
+  }
+
+  return textMatched || idMatched || titleMatched;
+});
+
+if (candidateLinks.length == 0) {
+  return null;
+}
+
+//reverse length sort
+candidateLinks = candidateLinks.sortBy(function(s) {
+  return s.length * -1;
+});
+
+return candidateLinks.first();

data/lib/webrat/selenium/location_strategy_javascript/webratlinkwithin.js

@@ -1,15 +1,15 @@
-var locatorParts = locator.split('|');
-var cssAncestor = locatorParts[0];
-var linkText = locatorParts[1];
-var matchingElements = cssQuery(cssAncestor, inDocument);
-var candidateLinks = matchingElements.collect(function(ancestor){
-  var links = ancestor.getElementsByTagName('a');
-  return $A(links).select(function(candidateLink) {
-    return PatternMatcher.matches(linkText, getText(candidateLink));
-  });
-}).flatten().compact();
-if (candidateLinks.length == 0) {
-  return null;
-}
-candidateLinks = candidateLinks.sortBy(function(s) { return s.length * -1; }); //reverse length sort
-return candidateLinks.first();
+var locatorParts = locator.split('|');
+var cssAncestor = locatorParts[0];
+var linkText = locatorParts[1];
+var matchingElements = cssQuery(cssAncestor, inDocument);
+var candidateLinks = matchingElements.collect(function(ancestor){
+  var links = ancestor.getElementsByTagName('a');
+  return $A(links).select(function(candidateLink) {
+    return PatternMatcher.matches(linkText, getText(candidateLink));
+  });
+}).flatten().compact();
+if (candidateLinks.length == 0) {
+  return null;
+}
+candidateLinks = candidateLinks.sortBy(function(s) { return s.length * -1; }); //reverse length sort
+return candidateLinks.first();

data/lib/webrat/selenium/location_strategy_javascript/webratselectwithoption.js

@@ -1,5 +1,5 @@
-var optionElements = inDocument.getElementsByTagName('option');
-var locatedOption = $A(optionElements).find(function(candidate){
-  return (PatternMatcher.matches(locator, getText(candidate)));
-});
-return locatedOption ? locatedOption.parentNode : null;
+var optionElements = inDocument.getElementsByTagName('option');
+var locatedOption = $A(optionElements).find(function(candidate){
+  return (PatternMatcher.matches(locator, getText(candidate)));
+});
+return locatedOption ? locatedOption.parentNode : null;

data/lib/webrat/selenium/matchers/have_content.rb

@@ -1,66 +1,66 @@
-module Webrat
-  module Selenium
-    module Matchers
-      class HasContent #:nodoc:
-        def initialize(content)
-          @content = content
-        end
-
-        def matches?(response)
-          if @content.is_a?(Regexp)
-            text_finder = "regexp:#{@content.source}"
-          else
-            text_finder = @content
-          end
-
-          response.session.wait_for do
-            response.selenium.is_text_present(text_finder)
-          end
-          rescue Webrat::TimeoutError
-            false
-        end
-
-        # ==== Returns
-        # String:: The failure message.
-        def failure_message
-          "expected the following element's content to #{content_message}:\n#{@element}"
-        end
-
-        # ==== Returns
-        # String:: The failure message to be displayed in negative matches.
-        def negative_failure_message
-          "expected the following element's content to not #{content_message}:\n#{@element}"
-        end
-
-        def content_message
-          case @content
-          when String
-            "include \"#{@content}\""
-          when Regexp
-            "match #{@content.inspect}"
-          end
-        end
-      end
-
-      # Matches the contents of an HTML document with
-      # whatever string is supplied
-      def contain(content)
-        HasContent.new(content)
-      end
-
-      # Asserts that the body of the response contain
-      # the supplied string or regexp
-      def assert_contain(content)
-        hc = HasContent.new(content)
-       assert hc.matches?(response), hc.failure_message
-      end
-
-      # Asserts that the body of the response
-      # does not contain the supplied string or regepx
-      def assert_not_contain(content)
-        hc = HasContent.new(content)
-        assert !hc.matches?(response), hc.negative_failure_message
-      end
-    end
-  end
-end
+module Webrat
+  module Selenium
+    module Matchers
+      class HasContent #:nodoc:
+        def initialize(content)
+          @content = content
+        end
+
+        def matches?(response)
+          if @content.is_a?(Regexp)
+            text_finder = "regexp:#{@content.source}"
+          else
+            text_finder = @content
+          end
+
+          response.session.wait_for do
+            response.selenium.is_text_present(text_finder)
+          end
+          rescue Webrat::TimeoutError
+            false
+        end
+
+        # ==== Returns
+        # String:: The failure message.
+        def failure_message
+          "expected the following element's content to #{content_message}:\n#{@element}"
+        end
+
+        # ==== Returns
+        # String:: The failure message to be displayed in negative matches.
+        def negative_failure_message
+          "expected the following element's content to not #{content_message}:\n#{@element}"
+        end
+
+        def content_message
+          case @content
+          when String
+            "include \"#{@content}\""
+          when Regexp
+            "match #{@content.inspect}"
+          end
+        end
+      end
+
+      # Matches the contents of an HTML document with
+      # whatever string is supplied
+      def contain(content)
+        HasContent.new(content)
+      end
+
+      # Asserts that the body of the response contain
+      # the supplied string or regexp
+      def assert_contain(content)
+        hc = HasContent.new(content)
+       assert hc.matches?(response), hc.failure_message
+      end
+
+      # Asserts that the body of the response
+      # does not contain the supplied string or regepx
+      def assert_not_contain(content)
+        hc = HasContent.new(content)
+        assert !hc.matches?(response), hc.negative_failure_message
+      end
+    end
+  end
+end