rwebspec-webdriver 0.3.7 → 0.4

data/Rakefile

@@ -69,7 +69,7 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec-webdriver"
-  s.version = "0.3.7"
+  s.version = "0.4"
   s.summary = "Executable functional specification for web applications in RSpec syntax and Selenium-WebDriver"
   # s.description = ""
 
@@ -88,9 +88,10 @@ spec = Gem::Specification.new do |s|
   s.files = s.files + Dir.glob( "test/**/*" )
   s.files = s.files + Dir.glob( "sample/**/*")
   s.files = s.files + Dir.glob( "docs/**/*" )
-  s.add_dependency(%q<rspec>, ["= 1.1.12"])
+  s.add_dependency(%q<rspec>, [">= 2.10"])
+  s.add_dependency(%q<rspec-core>, [">= 2.10.1"])
   s.add_dependency("selenium-webdriver", ">= 2.0.1")
-  s.add_dependency("sanitize", ">= 2.0.0")
+  # s.add_dependency("sanitize", ">= 2.0.0")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/lib/rspec_extensions.rb

@@ -1,51 +1,28 @@
-module Spec
-  module Extensions
-    module Main
 
-      alias :spec :describe
-      alias :specification :describe
-      alias :test_suite :describe
-      alias :suite :describe
-
-    end
-  end
+module RSpec
+  module Core
+ 		module DSL
+	    alias_method :specification, :describe
+    	alias_method :test_suite, :describe
+		end
+	end
 end
 
-# For RSpec 1.1.12
-module Spec
-  module DSL
-    module Main
+module RSpec
+  module Core
+    class ExampleGroup
 
-      alias :spec :describe
-      alias :specification :describe
-      alias :test_suite :describe
-      alias :suite :describe
+      define_example_method :scenario
+      define_example_method :story
+      define_example_method :test_case
+      define_example_method :use_case
+      define_example_method :test
 
-    end
-  end
-end
-
-# ZZ patches to RSpec 1.1.4
-#  - add to_s method to example_group
-module Spec
-  module Example
-    class ExampleGroup
-      def to_s
-        @_defined_description
+      class << self
+        alias_method :specification, :describe
+        alias_method :test_suite, :describe
       end
-    end
-  end
-end
-
-module Spec
-  module Example
-    module ExampleGroupMethods
 
-      alias_method :scenario, :it
-      alias_method :story, :it
-      alias_method :test_case, :it
-      alias_method :use_case, :it
-      alias_method :test, :it
     end
   end
 end

data/lib/rwebspec-webdriver.rb

@@ -13,11 +13,11 @@ rescue LoadError => no_as1_err
   # active_support 2.0 loaded error
 end
 require 'active_support/core_ext'
-require 'spec'
+require 'rspec'
 require 'selenium-webdriver'
 
 unless defined? RWEBSPEC_WEBDRIVER_VERSION
-  RWEBSPEC_WEBDRIVER_VERSION = "0.3.7"
+  RWEBSPEC_WEBDRIVER_VERSION = "0.4"
 end
 
 

data/lib/rwebspec-webdriver/web_browser.rb

@@ -9,7 +9,6 @@ rescue LoadError => e
   raise "You have must at least WebDriver installed"
 end
 
-require 'sanitize'
 require File.join(File.dirname(__FILE__), "element_locator.rb")
 
 module RWebSpec
@@ -244,19 +243,24 @@ module RWebSpec
         @browser.title
       end
 
-      #TODO return plain text of current web page
       def text(squeeze_spaces = true)
+				@browser.find_element(:tag_name, "body").text
+      end
+
+			# @deprecated
+			def text_with_sanitize				
 				begin
+					require 'sanitize'
         	page_text_string = Sanitize.clean(html)
-					page_text_string = page_text_string.squeeze(" ") if squeeze_spaces# remove duplicated (spaces)
+					page_text_string = page_text_string.squeeze(" ") if squeeze_spaces
+						# remove duplicated (spaces)
 					return page_text_string
 				rescue => e
-					@browser.find_element(:tag_name, "body").text
-					# puts "failed to santize html source => text, #{e}"
+					puts "failed to santize html source => text, #{e}"
+					return @browser.html
 				end
-        # @browser.text
-      end
-
+			end
+			
       [:images, :links, :buttons, :select_lists, :checkboxes, :radios, :text_fields, :divs, :dls, :dds, :dts, :ems, :lis, :maps, :spans, :strongs, :ps, :pres, :labels].each do |method|
         define_method method do
           @browser.send(method)

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 7
-  version: 0.3.7
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - Zhimin Zhan
@@ -14,7 +13,7 @@ autorequire: rwebspec-webdriver
 bindir: bin
 cert_chain: []
 
-date: 2012-05-06 00:00:00 +10:00
+date: 2012-05-28 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,17 +21,16 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 1
-        - 12
-        version: 1.1.12
+        - 2
+        - 10
+        version: "2.10"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: selenium-webdriver
+  name: rspec-core
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -40,13 +38,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 0
+        - 10
         - 1
-        version: 2.0.1
+        version: 2.10.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: sanitize
+  name: selenium-webdriver
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -55,8 +53,8 @@ dependencies:
         segments: 
         - 2
         - 0
-        - 0
-        version: 2.0.0
+        - 1
+        version: 2.0.1
   type: :runtime
   version_requirements: *id003
 description: