druid-ts 1.1.4 → 1.1.5

data/lib/druid/elements/video.rb

@@ -0,0 +1,17 @@
+module Druid
+  module Elements
+    class Video < Media
+
+      def height
+        height = attribute(:height)
+        return height.to_i if height
+      end
+
+      def width
+        width = attribute(:width)
+        return width.to_i if width
+      end
+    end
+    Druid::Elements.type_to_class[:video] = Druid::Elements::Video
+  end
+end

data/lib/druid/nested_elements.rb

@@ -203,5 +203,37 @@ module Druid
     def label_elements(identifier={:index => 0})
       labels_for(identifier)
     end
+
+    def area_element(identifier={:index => 0})
+      area_for(identifier)
+    end
+
+    def area_elements(identifier={:index => 0})
+      areas_for(identifier)
+    end
+
+    def canvas_element(identifier={:index => 0})
+      canvas_for(identifier)
+    end
+
+    def canvas_elements(identifier={:index => 0})
+      canvases_for(identifier)
+    end
+
+    def audio_element(identifier={:index => 0})
+      audio_for(identifier)
+    end
+
+    def audio_elements(identifier={:index => 0})
+      audios_for(identifier)
+    end
+
+    def video_element(identifier={:index => 0})
+      video_for(identifier)
+    end
+
+    def video_elements(identifier={:index => 0})
+      videos_for(identifier)
+    end
   end
 end

data/lib/druid/version.rb

@@ -1,3 +1,3 @@
 module Druid
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/spec/druid/accessors_spec.rb

@@ -31,6 +31,10 @@ class AccessorsTestDruid
   h6(:heading6, :id => 'main_heading')
   paragraph(:first_para, :id => 'first')
   file_field(:upload_me, :id => 'the_file')
+  area(:img_area, :id => 'area')
+  canvas(:my_canvas, :id => 'canvas_id')
+  audio(:acdc, :id => 'audio_id')
+  video(:movie, :id => 'video_id')
 end
 
 class BlockDruid
@@ -111,6 +115,18 @@ class BlockDruid
   file_field :a_file do |element|
     "file_field"
   end
+  area :img_area do |element|
+    "area"
+  end
+  canvas :my_canvas do |element|
+    "canvas"
+  end
+  audio :acdc do |element|
+    "audio"
+  end
+  video :movie do |element|
+    "video"
+  end
 end
 
 class TestDruidBackUp
@@ -1018,4 +1034,65 @@ describe Druid::Accessors do
       end
     end
   end
+
+  describe "area accessors" do
+    context "when called on a page object" do
+      it "should generate accessor methods" do
+        expect(druid).to respond_to(:img_area)
+        expect(druid).to respond_to(:img_area_element)
+      end
+
+      it "should call a block on the element method when present" do
+        expect(block_druid.img_area_element).to eql "area"
+      end
+    end
+
+    it "should click on the area" do
+      expect(driver).to receive(:area).and_return(driver)
+      expect(driver).to receive(:click)
+      druid.img_area
+    end
+
+    it "should retrieve the element from the page" do
+      expect(driver).to receive(:area).and_return(driver)
+      element = druid.img_area_element
+      expect(element).to be_instance_of Druid::Elements::Area
+    end
+  end
+
+  describe "canvas accessors" do
+    context "when called on a page object" do
+      it "should generate accessor methods" do
+        expect(druid).to respond_to(:my_canvas_element)
+      end
+
+      it "should call a block on the element method when present" do
+        expect(block_druid.my_canvas_element).to eql "canvas"
+      end
+    end
+  end
+
+  describe "audio accessors" do
+    context "when called on a page object" do
+      it "should generate accessor methods" do
+        expect(druid).to respond_to(:acdc_element)
+      end
+
+      it "should call a block on the element method when present" do
+        expect(block_druid.acdc_element).to eql "audio"
+      end
+    end
+  end
+
+  describe "video accessors" do
+    context "when called on a page object" do
+      it "should generate accessor methods" do
+        expect(druid).to respond_to(:movie_element)
+      end
+
+      it "should call a block on the element method when present" do
+        expect(block_druid.movie_element).to eql "video"
+      end
+    end
+  end
 end

data/spec/druid/element_locators_spec.rb

@@ -592,4 +592,93 @@ describe Druid::ElementLocators do
     expect(driver).to receive(:audio).with(:index => 0).and_return(driver)
     page.element(:audio)
   end
+
+  it "should find an area element" do
+    expect(driver).to receive(:area).with(:id => 'blah').and_return(driver)
+    element = page.area_element(:id => 'blah')
+    expect(element).to be_instance_of Druid::Elements::Area
+  end
+
+  it "should find an area element using a default identifier" do
+    expect(driver).to receive(:area).with(:index => 0).and_return(driver)
+    page.area_element
+  end
+
+  it "should find all area elements" do
+    expect(driver).to receive(:areas).with(:id => 'blah').and_return([driver])
+    elements = page.area_elements(:id => 'blah')
+    expect(elements[0]).to be_instance_of Druid::Elements::Area
+  end
+
+  it "should find all areas with no identifier" do
+    expect(driver).to receive(:areas).with({}).and_return([driver])
+    page.area_elements
+  end
+
+  it "should find a canvas element" do
+    expect(driver).to receive(:canvas).with(:id => 'blah').and_return(driver)
+    element = page.canvas_element(:id => 'blah')
+    expect(element).to be_instance_of Druid::Elements::Canvas
+  end
+
+  it "should find a canvas element using a default identifier" do
+    expect(driver).to receive(:canvas).with(:index => 0).and_return(driver)
+    page.canvas_element
+  end
+
+  it "should find all canvas elements" do
+    expect(driver).to receive(:canvases).with(:id => 'blah').and_return([driver])
+    elements = page.canvas_elements(:id => 'blah')
+    expect(elements[0]).to be_instance_of Druid::Elements::Canvas
+  end
+
+  it "should find all canvas elements with no identifier" do
+    expect(driver).to receive(:canvases).with({}).and_return([driver])
+    page.canvas_elements
+  end
+
+  it "should find an audio element" do
+    expect(driver).to receive(:audio).with(:id => 'blah').and_return(driver)
+    element = page.audio_element(:id => 'blah')
+    expect(element).to be_instance_of Druid::Elements::Audio
+  end
+
+  it "should find an audio element using a default identifier" do
+    expect(driver).to receive(:audio).with(:index => 0).and_return(driver)
+    page.audio_element
+  end
+
+  it "should find all audios elements" do
+    expect(driver).to receive(:audios).with(:id => 'blah').and_return([driver])
+    elements = page.audio_elements(:id => 'blah')
+    expect(elements[0]).to be_instance_of Druid::Elements::Audio
+  end
+
+  it "should find all audios elements with no identifier" do
+    expect(driver).to receive(:audios).with({}).and_return([driver])
+    page.audio_elements
+  end
+
+  it "should find an video element" do
+    expect(driver).to receive(:video).with(:id => 'blah').and_return(driver)
+    element = page.video_element(:id => 'blah')
+    expect(element).to be_instance_of Druid::Elements::Video
+  end
+
+  it "should find an video element using a default identifier" do
+    expect(driver).to receive(:video).with(:index => 0).and_return(driver)
+    page.video_element
+  end
+
+  it "should find all videos elements" do
+    expect(driver).to receive(:videos).with(:id => 'blah').and_return([driver])
+    elements = page.video_elements(:id => 'blah')
+    expect(elements[0]).to be_instance_of Druid::Elements::Video
+  end
+
+  it "should find all videos elements with no identifier" do
+    expect(driver).to receive(:videos).with({}).and_return([driver])
+    page.video_elements
+  end
+
 end

data/spec/druid/elements/area_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+require 'druid/elements'
+
+describe Druid::Elements::Area do
+  context "when mapping how to find an element" do
+    it "should map watir types to same" do
+      [:class, :id, :index, :name, :xpath].each do |t|
+        identifier = Druid::Elements::Area.identifier_for t => 'value'
+        expect(identifier.keys.first).to eql t
+      end
+    end
+  end
+
+  context "implementation" do
+    let(:element) { double('element') }
+    let(:area) { Druid::Elements::Area.new(element) }
+
+    it "should know its coords" do
+      expect(element).to receive(:attribute_value).with(:coords).and_return("1,2,3,4")
+      expect(area.coords).to eql "1,2,3,4"
+    end
+
+    it "should know its shape" do
+      expect(element).to receive(:attribute_value).with(:shape).and_return("circle")
+      expect(area.shape).to eql "circle"
+    end
+
+    it "should know its href" do
+      expect(element).to receive(:attribute_value).with(:href).and_return("twitter.com")
+      expect(area.href).to eql "twitter.com"
+    end
+  end
+end

data/spec/druid/elements/canvas_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'druid/elements'
+
+describe Druid::Elements::Canvas do
+  context "when mapping how to find an element" do
+    it "should map watir types to same" do
+      [:class, :id, :index, :name, :xpath].each do |t|
+        identifier = Druid::Elements::Canvas.identifier_for t => 'value'
+        expect(identifier.keys.first).to eql t
+      end
+    end
+  end
+
+  context "implementation" do
+    let(:element) { double('canvas_element') }
+    let(:canvas) { Druid::Elements::Canvas.new(element) }
+
+    it "should knwo its width" do
+      expect(element).to receive(:attribute_value).with(:width).and_return("400")
+      expect(canvas.width).to eql 400
+    end
+
+    it "should know its height" do
+      expect(element).to receive(:attribute_value).with(:height).and_return("100")
+      expect(canvas.height).to eql 100
+    end
+  end
+end

data/spec/druid/elements/list_item_spec.rb

@@ -4,7 +4,7 @@ require 'druid/elements'
 describe Druid::Elements::ListItem do
   describe "when mapping how to find an element" do
     it "should map watir types to same" do
-      [:class, :id, :index, :name, :xpath].each do |t|
+      [:class, :id, :index, :name, :xpath, :text].each do |t|
         identifier = Druid::Elements::ListItem.identifier_for t => 'value'
         expect(identifier.keys.first).to eql t
       end

data/spec/druid/elements/select_list_spec.rb

@@ -41,6 +41,12 @@ describe Druid::Elements::SelectList do
       expect(select_list.selected_options).to eql opts
     end
 
+    it "should be able to get the value for the selected options" do
+      allow(element).to receive(:selected_options).and_return(opts)
+      allow(element).to receive(:value).and_return(element)
+      expect(select_list.selected_values).to eql opts
+    end
+
     it "should know if it includes some value" do
       expect(element).to receive(:include?).with('blah').and_return(true)
       select_list.include?('blah')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: druid-ts
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Tim Sheng
@@ -83,8 +83,11 @@ files:
 - Rakefile
 - cucumber.yml
 - druid.gemspec
+- features/area.feature
 - features/async.feature
+- features/audio.feature
 - features/button.feature
+- features/canvas.feature
 - features/checkbox.feature
 - features/div.feature
 - features/element.feature
@@ -99,6 +102,7 @@ files:
 - features/html/frame_2.html
 - features/html/frame_3.html
 - features/html/frames.html
+- features/html/hover.html
 - features/html/iframes.html
 - features/html/images/circle.png
 - features/html/modal.html
@@ -110,8 +114,11 @@ files:
 - features/html/nested_frame_2.html
 - features/html/nested_frame_3.html
 - features/html/nested_frames.html
+- features/html/planets.gif
 - features/html/static_elements.html
 - features/html/success.html
+- features/html/sun.gif
+- features/html/sun.html
 - features/image.feature
 - features/javascript.feature
 - features/label.feature
@@ -124,15 +131,22 @@ files:
 - features/page_level_actions.feature
 - features/paragraph.feature
 - features/radio_button.feature
+- features/sample-app/public/04-Death_Becomes_Fur.mp4
+- features/sample-app/public/04-Death_Becomes_Fur.oga
 - features/sample-app/public/jquery-1.3.2.js
 - features/sample-app/public/jquery.html
+- features/sample-app/public/movie.mp4
+- features/sample-app/public/movie.ogg
 - features/sample-app/public/prototype-1.6.0.3.js
 - features/sample-app/public/prototype.html
 - features/sample-app/sample_app.rb
 - features/select_list.feature
 - features/span.feature
+- features/step_definations/area_steps.rb
 - features/step_definations/async_steps.rb
+- features/step_definations/audio_steps.rb
 - features/step_definations/button_steps.rb
+- features/step_definations/canvas_steps.rb
 - features/step_definations/checkbox_steps.rb
 - features/step_definations/div_steps.rb
 - features/step_definations/element_steps.rb
@@ -162,6 +176,7 @@ files:
 - features/step_definations/text_area_steps.rb
 - features/step_definations/text_field_steps.rb
 - features/step_definations/unordered_list_steps.rb
+- features/step_definations/video_steps.rb
 - features/support/ajax_test_environment.rb
 - features/support/env.rb
 - features/support/hooks.rb
@@ -173,13 +188,17 @@ files:
 - features/text_area.feature
 - features/text_field.feature
 - features/unordered_list.feature
+- features/video.feature
 - lib/druid.rb
 - lib/druid/accessors.rb
 - lib/druid/assist.rb
 - lib/druid/core_ext/string.rb
 - lib/druid/element_locators.rb
 - lib/druid/elements.rb
+- lib/druid/elements/area.rb
+- lib/druid/elements/audio.rb
 - lib/druid/elements/button.rb
+- lib/druid/elements/canvas.rb
 - lib/druid/elements/check_box.rb
 - lib/druid/elements/div.rb
 - lib/druid/elements/element.rb
@@ -191,6 +210,7 @@ files:
 - lib/druid/elements/label.rb
 - lib/druid/elements/link.rb
 - lib/druid/elements/list_item.rb
+- lib/druid/elements/media.rb
 - lib/druid/elements/option.rb
 - lib/druid/elements/ordered_list.rb
 - lib/druid/elements/paragraph.rb
@@ -203,6 +223,7 @@ files:
 - lib/druid/elements/text_area.rb
 - lib/druid/elements/text_field.rb
 - lib/druid/elements/unordered_list.rb
+- lib/druid/elements/video.rb
 - lib/druid/javascript/jquery.rb
 - lib/druid/javascript/prototype.rb
 - lib/druid/javascript/yui.rb
@@ -214,7 +235,9 @@ files:
 - spec/druid/accessors_spec.rb
 - spec/druid/druid_spec.rb
 - spec/druid/element_locators_spec.rb
+- spec/druid/elements/area_spec.rb
 - spec/druid/elements/button_spec.rb
+- spec/druid/elements/canvas_spec.rb
 - spec/druid/elements/check_box_spec.rb
 - spec/druid/elements/div_spec.rb
 - spec/druid/elements/element_spec.rb
@@ -269,8 +292,11 @@ signing_key:
 specification_version: 4
 summary: Druid DSL for browser testing
 test_files:
+- features/area.feature
 - features/async.feature
+- features/audio.feature
 - features/button.feature
+- features/canvas.feature
 - features/checkbox.feature
 - features/div.feature
 - features/element.feature
@@ -285,6 +311,7 @@ test_files:
 - features/html/frame_2.html
 - features/html/frame_3.html
 - features/html/frames.html
+- features/html/hover.html
 - features/html/iframes.html
 - features/html/images/circle.png
 - features/html/modal.html
@@ -296,8 +323,11 @@ test_files:
 - features/html/nested_frame_2.html
 - features/html/nested_frame_3.html
 - features/html/nested_frames.html
+- features/html/planets.gif
 - features/html/static_elements.html
 - features/html/success.html
+- features/html/sun.gif
+- features/html/sun.html
 - features/image.feature
 - features/javascript.feature
 - features/label.feature
@@ -310,15 +340,22 @@ test_files:
 - features/page_level_actions.feature
 - features/paragraph.feature
 - features/radio_button.feature
+- features/sample-app/public/04-Death_Becomes_Fur.mp4
+- features/sample-app/public/04-Death_Becomes_Fur.oga
 - features/sample-app/public/jquery-1.3.2.js
 - features/sample-app/public/jquery.html
+- features/sample-app/public/movie.mp4
+- features/sample-app/public/movie.ogg
 - features/sample-app/public/prototype-1.6.0.3.js
 - features/sample-app/public/prototype.html
 - features/sample-app/sample_app.rb
 - features/select_list.feature
 - features/span.feature
+- features/step_definations/area_steps.rb
 - features/step_definations/async_steps.rb
+- features/step_definations/audio_steps.rb
 - features/step_definations/button_steps.rb
+- features/step_definations/canvas_steps.rb
 - features/step_definations/checkbox_steps.rb
 - features/step_definations/div_steps.rb
 - features/step_definations/element_steps.rb
@@ -348,6 +385,7 @@ test_files:
 - features/step_definations/text_area_steps.rb
 - features/step_definations/text_field_steps.rb
 - features/step_definations/unordered_list_steps.rb
+- features/step_definations/video_steps.rb
 - features/support/ajax_test_environment.rb
 - features/support/env.rb
 - features/support/hooks.rb
@@ -359,10 +397,13 @@ test_files:
 - features/text_area.feature
 - features/text_field.feature
 - features/unordered_list.feature
+- features/video.feature
 - spec/druid/accessors_spec.rb
 - spec/druid/druid_spec.rb
 - spec/druid/element_locators_spec.rb
+- spec/druid/elements/area_spec.rb
 - spec/druid/elements/button_spec.rb
+- spec/druid/elements/canvas_spec.rb
 - spec/druid/elements/check_box_spec.rb
 - spec/druid/elements/div_spec.rb
 - spec/druid/elements/element_spec.rb