mediawiki_selenium 1.7.4 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d38f64db0bf43860d1b8d0feae3e76d485337d76
-  data.tar.gz: 0d27110edf8c9408026525ba5c1c55e1b60cce62
+  metadata.gz: d6db797531ecca1447bef8c4861e5a892ae293bb
+  data.tar.gz: fb6897ac2916f4b4a0b33d3846521847b4933a2a
 SHA512:
-  metadata.gz: 714bea306aa8e4a2ac952eeaf06b189dbbd6828e91025eac6f185aa9a00fe26f079988d81d98d79d19e071426266b5cb1d3db416572a91df08bb7d4989c975ec
-  data.tar.gz: 633500e507ca46f938b84472f8d7f029dea918cab4d51b1c23386313886c7eeb6b71d0c86d4daa098e4c25f8491c2278bd51e3934d378368774599da447ced99
+  metadata.gz: 52c4cee07ec34da9a5cd4260dfcc65a36f8359b1cf94641042cde5a98e3e1556f637688101efe08e527e83b9bfb88b8c82ba60179c55f294f6e63aec97ce6faf
+  data.tar.gz: 981a816a15de98c3f22db7f254280fa5171a77aab0b3e5e29d28032e220d9e7425f30be1aa361cabdf60ce06acdec4a2ec1f909cdea533dd929b9b9f0c47e065

data/.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  DisplayCopNames: true
   StyleGuideCopsOnly: true
   Exclude:
     - 'vendor/**/*'
@@ -22,6 +23,12 @@ Style/DotPosition:
 Style/FileName:
   Exclude: ['bin/*']
 
+Style/GuardClause:
+  Enabled: false
+
+Style/MultilineIfModifier:
+  Enabled: false
+
 Style/SignalException:
   Enabled: false
 

data/RELEASES.md

@@ -1,5 +1,23 @@
 ## Release notes
 
+### 1.8.0 2017-02-27
+* Remove raita entirely
+* Major updates in dependencies:
+  * page-object updated to version 2
+  * Watir updated to version 6
+  * Selenium updated to version 3
+* Major changes caused by upgrade to Selenium 3:
+  * default browser is Chrome, instead of Firefox
+  * geckodriver needs to be installed when driving Firefox
+* For more information about upstream changes:
+  * Selenium:
+    * Blog: https://seleniumhq.wordpress.com/
+    * Release notes: https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES
+  * Watir:
+    * Blog: http://watir.github.io/blog/
+    * Release notes: https://github.com/watir/watir/blob/master/CHANGES.md
+  * page-object release notes: https://github.com/cheezy/page-object/blob/master/ChangeLog
+
 ### 1.7.4 2016-12-28
 
 * Update JSON gem to version 2

data/lib/mediawiki_selenium.rb

@@ -9,7 +9,6 @@ module MediawikiSelenium
   autoload :Initializer, 'mediawiki_selenium/initializer'
   autoload :LoginHelper, 'mediawiki_selenium/helpers/login_helper'
   autoload :PageFactory, 'mediawiki_selenium/page_factory'
-  autoload :Raita, 'mediawiki_selenium/raita'
   autoload :RakeTask, 'mediawiki_selenium/rake_task'
   autoload :RemoteBrowserFactory, 'mediawiki_selenium/remote_browser_factory'
   autoload :ScreenshotHelper, 'mediawiki_selenium/helpers/screenshot_helper'

data/lib/mediawiki_selenium/browser_factory/base.rb

@@ -1,4 +1,4 @@
-require 'watir-webdriver'
+require 'watir'
 
 module MediawikiSelenium
   module BrowserFactory

data/lib/mediawiki_selenium/cucumber/env.rb

@@ -1,6 +1,6 @@
 require 'bundler/setup'
 require 'page-object/page_factory'
-require 'watir-webdriver'
+require 'watir'
 
 World { MediawikiSelenium::Environment.load_default }
 

data/lib/mediawiki_selenium/cucumber/hooks.rb

@@ -8,16 +8,6 @@ AfterConfiguration do |config|
   # Install a formatter that can be used to show feature-related warnings
   pretty_format, io = config.formats.find { |(format, _io)| format == 'pretty' }
   config.formats << ['MediawikiSelenium::WarningsFormatter', io] if pretty_format
-
-  # Set up Raita logging if RAITA_DB_URL is set. Include any useful
-  # environment variables that Jenkins would have set.
-  env = MediawikiSelenium::Environment.load_default
-  raita_url = env.lookup(:raita_url, default: nil)
-
-  if raita_url
-    raita_build = MediawikiSelenium::Raita.build_from(env)
-    config.formats << ['MediawikiSelenium::Raita::Logger', { url: raita_url, build: raita_build }]
-  end
 end
 
 # Determine scenario name and setup the environment

data/lib/mediawiki_selenium/environment.rb

@@ -575,7 +575,7 @@ module MediawikiSelenium
     end
 
     def browser_spec
-      lookup(:browser, default: 'firefox').to_s.downcase.split(' ')
+      lookup(:browser, default: 'chrome').to_s.downcase.split(' ')
     end
 
     def normalize_config(hash)

data/lib/mediawiki_selenium/pages/login_page.rb

@@ -19,9 +19,9 @@ class LoginPage
   end
 
   def login_with(username, password, wait_for_logout_element = true)
-    username_element.when_present.send_keys(username)
-    password_element.when_present.send_keys(password)
-    login_element.when_present.click
-    logout_element.when_present(10) if wait_for_logout_element
+    username_element.send_keys(username)
+    password_element.send_keys(password)
+    login_element.click
+    logout_element if wait_for_logout_element
   end
 end

data/lib/mediawiki_selenium/version.rb

@@ -1,3 +1,3 @@
 module MediawikiSelenium
-  VERSION = '1.7.4'
+  VERSION = '1.8.0'
 end

data/mediawiki_selenium.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/selenium'
   spec.license       = 'GPL-2'
 
-  spec.bindir      = 'bin'
+  spec.bindir = 'bin'
   spec.executables << 'mediawiki-selenium-init'
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
@@ -31,15 +31,11 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'headless', '~> 2.0', '>= 2.1.0'
   spec.add_runtime_dependency 'json', '~> 2.0', '>= 2.0.2'
   spec.add_runtime_dependency 'mediawiki_api', '~> 0.7', '>= 0.7.0'
-  spec.add_runtime_dependency 'page-object', '~> 1.0'
-
-  # selenium-webdriver 3.0.0 always want the 'geckodriver' to be available even
-  # with Firefox 46 can be driven without it. T149319
-  spec.add_runtime_dependency 'selenium-webdriver', '< 3'
-
+  spec.add_runtime_dependency 'page-object', '~> 2.0'
   spec.add_runtime_dependency 'rest-client', '~> 1.6', '>= 1.6.7'
   spec.add_runtime_dependency 'rspec-core', '~> 2.14', '>= 2.14.4'
   spec.add_runtime_dependency 'rspec-expectations', '~> 2.14', '>= 2.14.4'
+  spec.add_runtime_dependency 'selenium-webdriver', '~> 3.1.0'
   spec.add_runtime_dependency 'syntax', '~> 1.2', '>= 1.2.0'
   spec.add_runtime_dependency 'thor', '~> 0.19', '>= 0.19.1'
 
@@ -47,6 +43,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.6', '>= 1.6.3'
   spec.add_development_dependency 'yard', '~> 0.8', '>= 0.8.7.4'
   spec.add_development_dependency 'redcarpet', '~> 3.2', '>= 3.2.0'
-  spec.add_development_dependency 'rubocop', '~> 0.29.1'
+  spec.add_development_dependency 'rubocop', '~> 0.46.0'
   spec.add_development_dependency 'rspec-mocks', '~> 2.14', '>= 2.14.4'
 end

data/spec/environment_spec.rb

@@ -266,8 +266,8 @@ module MediawikiSelenium
       context 'missing browser configuration' do
         let(:browser) { nil }
 
-        it 'defaults to :firefox' do
-          expect(subject).to be(:firefox)
+        it 'defaults to :chrome' do
+          expect(subject).to be(:chrome)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediawiki_selenium
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.8.0
 platform: ruby
 authors:
 - Chris McMahon
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -101,28 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +169,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.4
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: syntax
   requirement: !ruby/object:Gem::Requirement
@@ -303,14 +303,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.46.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.46.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -406,10 +406,6 @@ files:
 - lib/mediawiki_selenium/pages/login_page.rb
 - lib/mediawiki_selenium/pages/random_page.rb
 - lib/mediawiki_selenium/pages/reset_preferences_page.rb
-- lib/mediawiki_selenium/raita.rb
-- lib/mediawiki_selenium/raita/formatter.rb
-- lib/mediawiki_selenium/raita/logger.rb
-- lib/mediawiki_selenium/raita/null_io.rb
 - lib/mediawiki_selenium/rake_task.rb
 - lib/mediawiki_selenium/remote_browser_factory.rb
 - lib/mediawiki_selenium/rspec.rb
@@ -461,7 +457,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: An easy way to run MediaWiki Selenium tests.

data/lib/mediawiki_selenium/raita.rb

@@ -1,46 +0,0 @@
-module MediawikiSelenium
-  # Supports logging to a Raita Elasticsearch index. Raita is a dashboard for
-  # visualizing and taking action on the results of Cucumber tests.
-  #
-  module Raita
-    # Mapping of environment configuration/variables to Raita build fields.
-    #
-    ENV_TO_BUILD_MAPPING = {
-      build_number:          :number,
-      build_url:             :url,
-      job_name:              [:project, :name],
-      git_commit:            [:project, :commit],
-      git_branch:            [:project, :branch],
-      git_url:               [:project, :repo],
-      mediawiki_environment: [:environment, :name],
-      mediawiki_url:         [:environment, :url],
-      browser:               [:browser, :name],
-      version:               [:browser, :version],
-      platform:              [:browser, :platform]
-    }
-
-    autoload :Formatter, 'mediawiki_selenium/raita/formatter'
-    autoload :Logger, 'mediawiki_selenium/raita/logger'
-    autoload :NullIO, 'mediawiki_selenium/raita/null_io'
-
-    # Returns a hash of relevant build information from the given {Environment}.
-    #
-    # @param env {Environment}
-    #
-    # @return {Hash} Raita build object.
-    #
-    def self.build_from(env)
-      ENV_TO_BUILD_MAPPING.each.with_object({}) do |(from, to), build|
-        value = env.lookup(from, default: nil)
-
-        case to
-        when Array
-          build[to.first] ||= {}
-          build[to.first][to.last] = value
-        else
-          build[to] = value
-        end
-      end
-    end
-  end
-end

data/lib/mediawiki_selenium/raita/formatter.rb

@@ -1,21 +0,0 @@
-require 'gherkin/formatter/json_formatter'
-
-module MediawikiSelenium
-  module Raita
-    class Formatter < Gherkin::Formatter::JSONFormatter
-      attr_reader :feature_hashes
-
-      def initialize
-        super(NullIO.new)
-      end
-
-      # Allows for simple embeddings without base64 encoding.
-      #
-      def embedding(mime_type, data)
-        return unless mime_type.start_with?('text/')
-
-        embeddings << { 'mime_type' => mime_type, 'data' => data }
-      end
-    end
-  end
-end

data/lib/mediawiki_selenium/raita/logger.rb

@@ -1,122 +0,0 @@
-require 'cucumber/formatter/gherkin_formatter_adapter'
-require 'net/http'
-
-module MediawikiSelenium
-  module Raita
-    class Logger < Cucumber::Formatter::GherkinFormatterAdapter
-      def initialize(_runtime, raita_options, options)
-        # Force expanded output of outlines. Note this will effect other
-        # formatters as well, but it's the only way to get a consistent JSON
-        # representation of feature elements with result status and duration.
-        #
-        # @see https://github.com/cucumber/gherkin/issues/165
-        options[:expand] = true
-
-        super(Formatter.new, false, options)
-
-        @db_url = URI.parse(raita_options[:url])
-        @build = raita_options[:build].merge(result: { status: 'passed', duration: 0 })
-      end
-
-      # Log everything at once to Raita's Elasticsearch DB.
-      #
-      def after_features(*)
-        @build_id = create('build', @build)['_id']
-
-        @gf.feature_hashes.each do |feature|
-          amend_feature(feature)
-          elements = feature.delete('elements')
-
-          feature_id = create('feature', feature, @build_id)['_id']
-          bulk('feature-element', elements, feature_id)
-
-          @build[:result][:status] = change_status(
-            @build[:result][:status],
-            feature['result']['status']
-          )
-          @build[:result][:duration] += feature['result']['duration']
-        end
-
-        update('build', @build_id, @build)
-      end
-
-      private
-
-      # Add status and duration at the feature and background/scenario level.
-      #
-      # @param feature {Hash}
-      #
-      def amend_feature(feature)
-        feature['result'] = { 'duration' => 0, 'status' => 'passed' }
-
-        feature['elements'].each do |element|
-          element['result'] = { 'duration' => 0, 'status' => 'passed' }
-
-          element['steps'].each do |step|
-            feature['result']['duration'] += step['result']['duration']
-            element['result']['duration'] += step['result']['duration']
-
-            element['result']['status'] = change_status(
-              element['result']['status'],
-              step['result']['status']
-            )
-          end
-
-          feature['result']['status'] = change_status(
-            feature['result']['status'],
-            element['result']['status']
-          )
-        end
-      end
-
-      # Calculates a new status given the current parent status and the next
-      # child status. A status can go from 'passed' to anything, 'skipped' to
-      # 'failed'.
-      #
-      def change_status(cur, new)
-        case cur.to_s
-        when 'passed'
-          new
-        when 'skipped'
-          new == 'failed' ? new : cur
-        else
-          cur
-        end
-      end
-
-      def bulk(type, objects, parent = nil)
-        data = objects.reduce('') do |d, obj|
-          d << JSON.dump({ create: { _type: type, _parent: parent, _routing: @build_id } }) + "\n"
-          d << JSON.dump(obj) + "\n\n"
-        end
-
-        request(Net::HTTP::Post, ['_bulk'], data)
-      end
-
-      def create(type, object, parent = nil)
-        request(Net::HTTP::Post, [type], object, parent: parent, routing: @build_id)
-      end
-
-      def request(klass, paths, data, query = {})
-        query = query.reject { |_, v| v.nil? }
-
-        uri = @db_url.clone
-        uri.path = Pathname.new(uri.path).join(*paths.map(&:to_s)).to_s
-        uri.query = query.map { |pair| pair.join('=') unless pair.last.nil? }.compact.join('&')
-
-        data = JSON.dump(data) unless data.is_a?(String)
-        response = db.request(klass.new(uri), data)
-
-        JSON.parse(response.body)
-      end
-
-      def update(type, id, object)
-        request(Net::HTTP::Put, [type, id], object)
-      end
-
-      def db
-        Net::HTTP.new(@db_url.host, @db_url.port)
-      end
-    end
-  end
-end

data/lib/mediawiki_selenium/raita/null_io.rb

@@ -1,8 +0,0 @@
-module MediawikiSelenium
-  module Raita
-    class NullIO
-      def write(*)
-      end
-    end
-  end
-end