watir_pump 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c3bcc424954cdcc59cecdb50c0018bc61f28d36
-  data.tar.gz: b67d48f87edf576d5416a46df0e2c921b692d0d8
+  metadata.gz: 55ea2b14189a53f881455afccfcb1d8eae770284
+  data.tar.gz: 3c3f9d78ba3a2cd64e303862712d707af8f42484
 SHA512:
-  metadata.gz: 5849c0b42c0f198876bc20d3b48a5ac74e4afbce99b7a83c8af9a6ba709d8031fbe8ee7dcabdb6336babec4e1864baf5934851c28c82f568ff7d8f3f90c627da
-  data.tar.gz: cfb180a53d56cb07e28e4a8a33e5285316f0c7b7a5bd8b1dc75b73d13c798d794d8a2680abcf6feffc00bf24c8baff1b95a77f5113ce664fa9ca6ae0b6971d17
+  metadata.gz: d4d027333cd88cce8bcbd38763261f3dd4ee7110141d4db4092e486273a6fe0399427b8358ae156cca17014a92edb9781744d0cfa8acaf4ee29dec887df34da4
+  data.tar.gz: a4b8a3405bbbe6623087ddeafa448c71ab15982e14f8fd6f3e47a4bcf587296dd255dc1259a524e45f0c1d02e4fa202c6ffbac1e8efe5ab733046c320fc9354b

data/lib/watir_pump/component.rb

@@ -6,6 +6,7 @@ require 'forwardable'
 require_relative 'component_collection'
 require_relative 'decorated_element'
 require_relative 'constants'
+require_relative 'watir_method_mapping'
 require_relative 'components/radio_group'
 require_relative 'components/checkbox_group'
 require_relative 'components/dropdown_list'
@@ -242,17 +243,26 @@ module WatirPump
 
     def find_element_raw(watir_method: nil, watir_method_args: nil, code: nil, code_args: nil) # rubocop:disable Metrics/LineLength
       if code.is_a? Proc
-        instance_exec(*code_args, &code)
+        evaluated = instance_exec(*code_args, &code)
+        check_watir_method_mapping(watir_method, evaluated)
       elsif watir_method
         root.send(watir_method, *watir_method_args)
       end
     end
 
-    def method_missing(name, *args)
+    # Raise error if watir_method (e.g. :image)
+    #  does not correspond to returned element (e.g. Watir::Table)
+    def check_watir_method_mapping(watir_method, evaluated)
+      return evaluated unless watir_method.is_a?(Symbol)
+      return evaluated if evaluated.class == WATIR_METHOD_MAPPING[watir_method]
+      raise "#{evaluated.class} class does not match expected: #{watir_method}"
+    end
+
+    def method_missing(name, *args, &blk)
       # delegate missing methods to current RSpec example if set
       example = WatirPump.config.current_example
       if example&.instance_exec { respond_to? name }
-        return example.instance_exec { send(name, *args) }
+        return example.instance_exec { send(name, *args, &blk) }
       end
       super
     end

data/lib/watir_pump/watir_method_mapping.rb

@@ -0,0 +1,324 @@
+# frozen_string_literal: true
+
+# rubocop:disable Metrics/ModuleLength
+
+module WatirPump
+  WATIR_METHOD_MAPPING = {
+    a: Watir::Anchor,
+    as: Watir::AnchorCollection,
+    abbr: Watir::HTMLElement,
+    abbrs: Watir::HTMLElementCollection,
+    address: Watir::HTMLElement,
+    addresses: Watir::HTMLElementCollection,
+    area: Watir::Area,
+    areas: Watir::AreaCollection,
+    article: Watir::HTMLElement,
+    articles: Watir::HTMLElementCollection,
+    aside: Watir::HTMLElement,
+    asides: Watir::HTMLElementCollection,
+    audio: Watir::Audio,
+    audios: Watir::AudioCollection,
+    b: Watir::HTMLElement,
+    bs: Watir::HTMLElementCollection,
+    base: Watir::Base,
+    bases: Watir::BaseCollection,
+    bdi: Watir::HTMLElement,
+    bdis: Watir::HTMLElementCollection,
+    bdo: Watir::HTMLElement,
+    bdos: Watir::HTMLElementCollection,
+    blockquote: Watir::Quote,
+    blockquotes: Watir::QuoteCollection,
+    body: Watir::Body,
+    bodys: Watir::BodyCollection,
+    br: Watir::BR,
+    brs: Watir::BRCollection,
+    button: Watir::Button,
+    buttons: Watir::ButtonCollection,
+    canvas: Watir::Canvas,
+    canvases: Watir::CanvasCollection,
+    caption: Watir::TableCaption,
+    captions: Watir::TableCaptionCollection,
+    cite: Watir::HTMLElement,
+    cites: Watir::HTMLElementCollection,
+    code: Watir::HTMLElement,
+    codes: Watir::HTMLElementCollection,
+    col: Watir::TableCol,
+    cols: Watir::TableColCollection,
+    colgroup: Watir::TableCol,
+    colgroups: Watir::TableColCollection,
+    data: Watir::Data,
+    datas: Watir::DataCollection,
+    datalist: Watir::DataList,
+    datalists: Watir::DataListCollection,
+    dd: Watir::HTMLElement,
+    dds: Watir::HTMLElementCollection,
+    del: Watir::Mod,
+    dels: Watir::ModCollection,
+    details: Watir::Details,
+    detailses: Watir::DetailsCollection,
+    dfn: Watir::HTMLElement,
+    dfns: Watir::HTMLElementCollection,
+    div: Watir::Div,
+    divs: Watir::DivCollection,
+    dl: Watir::DList,
+    dls: Watir::DListCollection,
+    dt: Watir::HTMLElement,
+    dts: Watir::HTMLElementCollection,
+    em: Watir::HTMLElement,
+    ems: Watir::HTMLElementCollection,
+    embed: Watir::Embed,
+    embeds: Watir::EmbedCollection,
+    fieldset: Watir::FieldSet,
+    fieldsets: Watir::FieldSetCollection,
+    figcaption: Watir::HTMLElement,
+    figcaptions: Watir::HTMLElementCollection,
+    figure: Watir::HTMLElement,
+    figures: Watir::HTMLElementCollection,
+    footer: Watir::HTMLElement,
+    footers: Watir::HTMLElementCollection,
+    form: Watir::Form,
+    forms: Watir::FormCollection,
+    frameset: Watir::FrameSet,
+    framesets: Watir::FrameSetCollection,
+    h1: Watir::Heading,
+    h1s: Watir::HeadingCollection,
+    h2: Watir::Heading,
+    h2s: Watir::HeadingCollection,
+    h3: Watir::Heading,
+    h3s: Watir::HeadingCollection,
+    h4: Watir::Heading,
+    h4s: Watir::HeadingCollection,
+    h5: Watir::Heading,
+    h5s: Watir::HeadingCollection,
+    h6: Watir::Heading,
+    h6s: Watir::HeadingCollection,
+    head: Watir::Head,
+    heads: Watir::HeadCollection,
+    header: Watir::HTMLElement,
+    headers: Watir::HTMLElementCollection,
+    hr: Watir::HR,
+    hrs: Watir::HRCollection,
+    html: Watir::Html,
+    htmls: Watir::HtmlCollection,
+    i: Watir::HTMLElement,
+    is: Watir::HTMLElementCollection,
+    iframe: Watir::IFrame,
+    iframes: Watir::IFrameCollection,
+    image: Watir::Image,
+    images: Watir::ImageCollection,
+    img: Watir::Image,
+    imgs: Watir::ImageCollection,
+    input: Watir::Input,
+    inputs: Watir::InputCollection,
+    ins: Watir::Mod,
+    inses: Watir::ModCollection,
+    kbd: Watir::HTMLElement,
+    kbds: Watir::HTMLElementCollection,
+    keygen: Watir::Keygen,
+    keygens: Watir::KeygenCollection,
+    label: Watir::Label,
+    labels: Watir::LabelCollection,
+    legend: Watir::Legend,
+    legends: Watir::LegendCollection,
+    li: Watir::LI,
+    lis: Watir::LICollection,
+    link: Watir::Anchor,
+    links: Watir::AnchorCollection,
+    main: Watir::HTMLElement,
+    mains: Watir::HTMLElementCollection,
+    map: Watir::Map,
+    maps: Watir::MapCollection,
+    mark: Watir::HTMLElement,
+    marks: Watir::HTMLElementCollection,
+    menu: Watir::Menu,
+    menus: Watir::MenuCollection,
+    menuitem: Watir::MenuItem,
+    menuitems: Watir::MenuItemCollection,
+    meta: Watir::Meta,
+    metas: Watir::MetaCollection,
+    meter: Watir::Meter,
+    meters: Watir::MeterCollection,
+    nav: Watir::HTMLElement,
+    navs: Watir::HTMLElementCollection,
+    noscript: Watir::HTMLElement,
+    noscripts: Watir::HTMLElementCollection,
+    object: Watir::Object,
+    objects: Watir::ObjectCollection,
+    ol: Watir::OList,
+    ols: Watir::OListCollection,
+    optgroup: Watir::OptGroup,
+    optgroups: Watir::OptGroupCollection,
+    option: Watir::Option,
+    options: Watir::OptionCollection,
+    output: Watir::Output,
+    outputs: Watir::OutputCollection,
+    p: Watir::Paragraph,
+    ps: Watir::ParagraphCollection,
+    param: Watir::Param,
+    params: Watir::ParamCollection,
+    picture: Watir::Picture,
+    pictures: Watir::PictureCollection,
+    pre: Watir::Pre,
+    pres: Watir::PreCollection,
+    progress: Watir::Progress,
+    progresses: Watir::ProgressCollection,
+    q: Watir::Quote,
+    qs: Watir::QuoteCollection,
+    rb: Watir::HTMLElement,
+    rbs: Watir::HTMLElementCollection,
+    rp: Watir::HTMLElement,
+    rps: Watir::HTMLElementCollection,
+    rt: Watir::HTMLElement,
+    rts: Watir::HTMLElementCollection,
+    rtc: Watir::HTMLElement,
+    rtcs: Watir::HTMLElementCollection,
+    ruby: Watir::HTMLElement,
+    rubies: Watir::HTMLElementCollection,
+    s: Watir::HTMLElement,
+    ss: Watir::HTMLElementCollection,
+    samp: Watir::HTMLElement,
+    samps: Watir::HTMLElementCollection,
+    script: Watir::Script,
+    scripts: Watir::ScriptCollection,
+    section: Watir::HTMLElement,
+    sections: Watir::HTMLElementCollection,
+    select: Watir::Select,
+    selects: Watir::SelectCollection,
+    small: Watir::HTMLElement,
+    smalls: Watir::HTMLElementCollection,
+    source: Watir::Source,
+    sources: Watir::SourceCollection,
+    span: Watir::Span,
+    spans: Watir::SpanCollection,
+    strong: Watir::HTMLElement,
+    strongs: Watir::HTMLElementCollection,
+    style: Watir::Style,
+    styles: Watir::StyleCollection,
+    sub: Watir::HTMLElement,
+    subs: Watir::HTMLElementCollection,
+    summary: Watir::HTMLElement,
+    summaries: Watir::HTMLElementCollection,
+    sup: Watir::HTMLElement,
+    sups: Watir::HTMLElementCollection,
+    table: Watir::Table,
+    tables: Watir::TableCollection,
+    tbody: Watir::TableSection,
+    tbodys: Watir::TableSectionCollection,
+    td: Watir::TableDataCell,
+    tds: Watir::TableDataCellCollection,
+    template: Watir::Template,
+    templates: Watir::TemplateCollection,
+    textarea: Watir::TextArea,
+    textareas: Watir::TextAreaCollection,
+    tfoot: Watir::TableSection,
+    tfoots: Watir::TableSectionCollection,
+    th: Watir::TableHeaderCell,
+    ths: Watir::TableHeaderCellCollection,
+    thead: Watir::TableSection,
+    theads: Watir::TableSectionCollection,
+    time: Watir::Time,
+    times: Watir::TimeCollection,
+    title: Watir::Title,
+    titles: Watir::TitleCollection,
+    tr: Watir::TableRow,
+    trs: Watir::TableRowCollection,
+    track: Watir::Track,
+    tracks: Watir::TrackCollection,
+    u: Watir::HTMLElement,
+    us: Watir::HTMLElementCollection,
+    ul: Watir::UList,
+    uls: Watir::UListCollection,
+    var: Watir::HTMLElement,
+    vars: Watir::HTMLElementCollection,
+    video: Watir::Video,
+    videos: Watir::VideoCollection,
+    wbr: Watir::HTMLElement,
+    wbrs: Watir::HTMLElementCollection,
+
+    # SVG
+    circle: Watir::Circle,
+    circles: Watir::CircleCollection,
+    cursor: Watir::Cursor,
+    cursors: Watir::CursorCollection,
+    defs: Watir::Defs,
+    defss: Watir::DefsCollection,
+    desc: Watir::Desc,
+    descs: Watir::DescCollection,
+    ellipse: Watir::Ellipse,
+    ellipses: Watir::EllipseCollection,
+    foreign_object: Watir::ForeignObject,
+    foreign_objects: Watir::ForeignObjectCollection,
+    g: Watir::G,
+    gs: Watir::GCollection,
+    hatchpath: Watir::Hatchpath,
+    hatchpaths: Watir::HatchpathCollection,
+    line: Watir::Line,
+    lines: Watir::LineCollection,
+    linear_gradient: Watir::LinearGradient,
+    linear_gradients: Watir::LinearGradientCollection,
+    marker: Watir::Marker,
+    markers: Watir::MarkerCollection,
+    mesh: Watir::Mesh,
+    meshes: Watir::MeshCollection,
+    meshgradient: Watir::MeshGradient,
+    meshgradients: Watir::MeshGradientCollection,
+    meshpatch: Watir::Meshpatch,
+    meshpatches: Watir::MeshpatchCollection,
+    meshrow: Watir::Meshrow,
+    meshrows: Watir::MeshrowCollection,
+    metadata: Watir::Metadata,
+    metadatas: Watir::MetadataCollection,
+    path: Watir::Path,
+    paths: Watir::PathCollection,
+    pattern: Watir::Pattern,
+    patterns: Watir::PatternCollection,
+    polygon: Watir::Polygon,
+    polygons: Watir::PolygonCollection,
+    polyline: Watir::Polyline,
+    polylines: Watir::PolylineCollection,
+    radial_gradient: Watir::RadialGradient,
+    radial_gradients: Watir::RadialGradientCollection,
+    rect: Watir::Rect,
+    rects: Watir::RectCollection,
+    solidcolor: Watir::Solidcolor,
+    solidcolors: Watir::SolidcolorCollection,
+    stop: Watir::Stop,
+    stops: Watir::StopCollection,
+    svg: Watir::SVG,
+    svgs: Watir::SVGCollection,
+    switch: Watir::Switch,
+    switches: Watir::SwitchCollection,
+    symbol: Watir::Symbol,
+    symbols: Watir::SymbolCollection,
+    text_path: Watir::TextPath,
+    text_paths: Watir::TextPathCollection,
+    tspan: Watir::TSpan,
+    tspans: Watir::TSpanCollection,
+    use: Watir::Use,
+    uses: Watir::UseCollection,
+    view: Watir::View,
+    views: Watir::ViewCollection,
+
+    # others
+    radio: Watir::Radio,
+    radios: Watir::RadioCollection,
+    date_time_field: Watir::DateTimeField,
+    date_time_fields: Watir::DateTimeFieldCollection,
+    date_field: Watir::DateField,
+    date_fields: Watir::DateFieldCollection,
+    frame: Watir::Frame,
+    frames: Watir::FrameCollection,
+    file_field: Watir::FileField,
+    file_fields: Watir::FileFieldCollection,
+    hidden: Watir::Hidden,
+    hiddens: Watir::HiddenCollection,
+    checkbox: Watir::CheckBox,
+    checkboxes: Watir::CheckBoxCollection,
+    font: Watir::Font,
+    fonts: Watir::FontCollection,
+    text_field: Watir::TextField,
+    text_fields: Watir::TextFieldCollection
+  }.freeze
+end
+
+# rubocop:enable Metrics/ModuleLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir_pump
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Bartek Wilczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -143,6 +143,7 @@ files:
 - lib/watir_pump/constants.rb
 - lib/watir_pump/decorated_element.rb
 - lib/watir_pump/page.rb
+- lib/watir_pump/watir_method_mapping.rb
 homepage: https://github.com/bwilczek/watir_pump
 licenses:
 - MIT
@@ -163,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Page Object pattern for Watir. Hacker friendly and enterprise ready.