operawatir 0.4-jruby → 0.4.1-jruby

data/spec/{new_watirspec → watir3}/browser_spec.rb

@@ -49,6 +49,11 @@ describe 'Browser' do
   end
 
   describe '#quit' do
+    it 'exists' do
+      browser.should respond_to :quit
+    end
+
+=begin
     before :each do
       browser.quit
     end
@@ -76,8 +81,12 @@ describe 'Browser' do
     after :all do
 #      OperaWatir::Helper.reconnect
     end
+=end
+
   end
 
+
+
 =begin
   describe '#windows' do
     before :all do
@@ -109,19 +118,6 @@ describe 'Browser' do
   end
 =end
 
-  describe '#version' do
-    it 'fetches the version number of the driver' do
-      browser.version.should match /\d{1,}\.\d{1,}\.\d{1,}/
-    end
-  end
-
-  describe '#pid' do
-    it 'fetches the PID from the attached browser instance' do
-      browser.pid.should be_integer
-      browser.pid.should_not be_zero
-    end
-  end
-
   describe '#platform' do
     it 'fetches the platform the browser is running on' do
       # TODO: Improve regexp
@@ -129,13 +125,6 @@ describe 'Browser' do
     end
   end
 
-  describe '#build' do
-    it 'fetches the build number of the attached browser instance' do
-      browser.build.should be_integer
-      browser.build.should_not be_zero
-    end
-  end
-
   describe '#path' do
     it 'fetches the full path to the binary of the attached browser' do
       # TODO: Improve regexp
@@ -153,11 +142,12 @@ describe 'Browser' do
     it 'is attached to a browser instance' do
       browser.connected?.should be_true
     end
-
+=begin
     it 'is not attached to a browser instance' do
       browser.quit
       browser.connected?.should be_false
     end
+=end
   end
 
   describe '#desktop?' do

data/spec/{new_watirspec → watir3}/clipboard_spec.rb

@@ -16,8 +16,8 @@ describe 'Browser' do
 
   describe '#select_all' do
     it 'selects the value of an input field' do
-      window.eval_js('one = document.getElementById("one");')
-      window.eval_js('one.value.substr(one.selectionStart, one.selectionEnd - one.selectionStart)').to_s.should == 'foobar'
+      window.execute_script('one = document.getElementById("one");')
+      window.execute_script('one.value.substr(one.selectionStart, one.selectionEnd - one.selectionStart)').to_s.should == 'foobar'
     end
   end
 

data/spec/{new_watirspec → watir3}/element_spec.rb

@@ -109,15 +109,6 @@ describe 'Element' do
     end
   end
 
-  # hash
-  describe '#visual_hash' do
-    it 'is the MD5 hash of the screenshot of the element' do
-      window.url = fixture('images.html')
-      # this hash is from from Watir 1
-      image = window.find_by_tag(:img)[1].visual_hash.should == '0x45688373bcf08d9ecf111ecb2bcb7c4e'
-    end
-  end
-
   # states
   # ------
 
@@ -436,14 +427,14 @@ describe 'Element' do
     end
   end
 
-  describe '#trigger!' do
+  describe '#fire_event' do
     it 'fires the given event on the element' do
-      window.find_by_id('link_3').first.trigger!('click')
+      window.find_by_id('link_3').fire_event :click
       browser.url.should include 'forms_with_input_elements.html'
     end
 
     it 'fires event handlers' do
-      window.find_by_id('html_test').first.trigger!('dblclick')
+      window.find_by_id('html_test').first.fire_event :dblclick
       window.find_by_id('messages').first.text.should include 'double clicked'
     end
   end
@@ -453,4 +444,31 @@ describe 'Element' do
 
   # style
 
+
+
+  # drag and drop
+  # -------------
+
+  describe '#drag_and_drop_by' do
+    it 'drags an element 100 pixels right and down' do
+      browser.url = fixture('draggable.html')
+      @draggable = window.find_by_id('draggable')
+
+      @draggable.location.to_s.should == 'x100y100'
+      @draggable.drag_and_drop_by(100,100)
+      @draggable.location.to_s.should == 'x200y200'
+    end
+  end
+
+  describe '#drag_and_drop_on' do
+    it 'drags one element onto another, triggering the correct events' do
+      browser.url = fixture('draggable.html')
+      @draggable = window.find_by_id('draggable')
+      @droppable = window.find_by_id('droppable')
+
+      @draggable.drag_and_drop_on(@droppable)
+      @droppable.text.should include 'Om nom nom!'
+    end
+  end
+
 end

data/spec/watir3/guards.rb

@@ -0,0 +1,39 @@
+module WatirSpec
+  class Guard
+
+    attr_accessor :type, :browsers, :data
+  
+    def initialize(type, browsers, data={})
+      self.type, self.browsers, self.data = type, browsers, data
+      WatirSpec.guards << self
+    end
+  
+    def guarded?(browser)
+      WatirSpec.guarded? || browsers.include?(browser.name)
+    end
+  
+    module Helpers
+      def deviates_on(*browsers)
+        guard = WatirSpec::Guard.new :deviation, browsers, :file => caller.first
+        yield unless guard.guarded?(OperaWatir::Helper.browser)
+      end
+
+      def not_compliant_on(*browsers)
+        guard = WatirSpec::Guard.new :non_compliance, browsers, :file => caller.first
+        yield unless guard.guarded?(OperaWatir::Helper.browser)
+      end
+
+      def compliant_on(*browsers)
+        guard = WatirSpec::Guard.new :compliance, browsers, :file => caller.first
+        yield unless guard.guarded?(OperaWatir::Helper.browser)
+      end
+
+      def bug(url, *browsers)
+        guard = WatirSpec::Guard.new :bug, browsers, :file => caller.first, :url => url
+        yield unless guard.guarded?(OperaWatir::Helper.browser)
+      end
+    end
+    
+  end
+end
+

data/spec/watir3/server.rb

@@ -0,0 +1,91 @@
+# encoding: utf-8
+require 'sinatra/base'
+
+class WatirSpec::Server < ::Sinatra::Base
+
+  set :app_file,    __FILE__
+  set :root,        File.dirname(__FILE__)
+  set :public,      lambda { File.join(root, 'fixtures')}
+  set :static,      true
+  set :run,         false
+  set :environment, :production
+  set :bind,        'localhost'
+  set :port,        2000
+  set :server,      %w[thin mongrel webrick]
+
+  get '/' do
+    self.class.name
+  end
+
+  get '/big' do
+    Class.new do
+      def each(&blk)
+        yield "<html><head><title>Big Content</title></head><body>"
+        string = "hello "*205
+        300.times { yield string }
+        yield "</body></html>"
+      end
+    end.new
+  end
+
+  post '/post_to_me' do
+    "You posted the following content:\n#{ env['rack.input'].read }"
+  end
+
+  get '/plain_text' do
+    content_type 'text/plain'
+    'This is text/plain'
+  end
+
+  get '/ajax' do
+    sleep 10
+    "A slooow ajax response"
+  end
+
+  get '/charset_mismatch' do
+    content_type 'text/html; charset=UTF-8'
+    %{
+      <html>
+        <head>
+          <meta http-equiv="Content-type" content="text/html; charset=iso-8859-1" />
+        </head>
+        <body>
+          <h1>ø</h1>
+        </body>
+      </html>
+    }
+  end
+
+  get '/octet_stream' do
+    content_type 'application/octet-stream'
+    'This is application/octet-stream'
+  end
+
+  get '/set_cookie' do
+    content_type 'text/plain'
+    headers 'Set-Cookie' => "monster=/"
+
+    "C is for cookie, it's good enough for me"
+  end
+
+  get '/header_echo' do
+    content_type 'text/plain'
+    env.inspect
+  end
+
+  get '/authentication' do
+    auth = Rack::Auth::Basic::Request.new(env)
+
+    unless auth.provided? && auth.credentials == %w[foo bar]
+      headers 'WWW-Authenticate' => %(Basic realm="localhost")
+      halt 401, 'Authorization Required'
+    end
+
+    "ok"
+  end
+
+  get '/encodable_<stuff>' do
+    'page with characters in URI that need encoding'
+  end
+
+end

data/spec/{new_watirspec → watir3}/window_spec.rb

@@ -121,7 +121,7 @@ describe 'Window' do
     end
 
     it 'changes when the title tag changes' do
-      window.find_by_tag(:title).first.text = 'changed'
+      window.execute_script('document.title = "changed"')
       window.title.should == 'changed'
     end
   end
@@ -209,107 +209,32 @@ describe 'Window' do
 
   # click(x,y)
 
-  describe '#type' do
-    it 'types the given characters' do
-      browser.url = fixture('forms_with_input_elements.html')
-      textbox = window.find_by_id('new_user_first_name').first
-      textbox.focus!
-      window.type('test')
-      textbox.attr(:value).should == 'test'
-    end
-
-    it 'sends keypress events' do
-      browser.url = fixture('keys.html')
-      window.type('hello')
-      window.find_by_id('log').text.should include 'press, 104, h,'
-      window.find_by_id('log').text.should include 'down, 69, E,'
-      window.find_by_id('log').text.should include 'up, 79, O,'
-    end
-  end
-
-  describe '#key' do
-    before :each do
-      browser.url = fixture('keys.html')
-    end
-
-    it 'presses and releases the given key' do
-      # TODO Is this how we should send ctrl/shift/alt?
-      window.key('ctrl')
-
-      window.find_by_id('log').text.should include 'down'
-      window.find_by_id('log').text.should include 'ctrl'
-      window.find_by_id('log').text.should include 'up'
-    end
-
-    it 'can press the home key' do
-      window.key('home')
-      window.find_by_id('log').text.should include 'press, 36'
-    end
-
-    it 'can press the tab key' do
-      window.key('tab')
-      window.find_by_id('log').text.should include 'press, 9'
-    end
-
-    it 'tabs through fields when tab is pressed' do
-      window.url = fixture('forms_with_input_elements.html')
-      window.key('tab')
-      window.find_by_id('new_user_first_name').focused?.should be_true
-    end
-
-    it 'can press the F3 key' do
-      window.key('f3')
-      window.find_by_id('log').text.should include 'press, 114'
-    end
-  end
-
-  describe '#key_down' do
-    it 'presses down the given key' do
-      browser.url = fixture('keys.html')
-      window.key_down('ctrl')
-      window.key_down('shift')
-      window.find_by_id('log').text.should include 'ctrl,shift'
-      # Don't leave them pressed down
-      window.key_up('ctrl')
-      window.key_up('shift')
-    end
-  end
-
-  describe '#key_up' do
-    it 'releases the given key' do
-      browser.url = fixture('keys.html')
-      window.key_down('ctrl')
-      window.key_up('ctrl')
-      window.find_by_id('log').text.should include 'up, 17'
-    end
-  end
-
-  describe '#eval_js' do
+  describe '#execute_script' do
     it 'executes Javascript in the page' do
-      window.eval_js('document.title = "test"')
+      window.execute_script('document.title = "test"')
       window.title.should == 'test'
     end
 
     it 'returns an element when the Javascript does' do
-      window.eval_js('document.createElement("div")').tag_name.should match /div/i
+      window.execute_script('document.createElement("div")').tag_name.should match /div/i
     end
 
     it 'returns a number when the Javascript does' do
-      window.eval_js('Math.abs(-5)').should == 5
+      window.execute_script('Math.abs(-5)').should == 5
     end
 
     it 'returns a boolean when the Javascript does' do
-      window.eval_js('(function(){return true;})()').should be_true
+      window.execute_script('(function(){return true;})()').should be_true
     end
 
     it 'returns an array when the Javascript does' do
-      result = window.eval_js('["this", "is", "a", "test"]')  # WTR-227
+      result = window.execute_script('["this", "is", "a", "test"]')  # WTR-227
       result.length.should == 4
       result[3].should == 'test'
     end
 
     it 'returns a string when the result is not one of these types' do
-      window.eval_js('({one:"two"}).toString()').should == '[object Object]'
+      window.execute_script('({one:"two"}).toString()').should == '[object Object]'
     end
   end