mediawiki_selenium 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffa3ecc9539e538abf8730f38ba611ded2b25006
-  data.tar.gz: 85ab4f6ebb1f28a385df0c95a492ee24d9d1ed78
+  metadata.gz: ccc71f5c503fa3584924d25edd822abfeeb12f3b
+  data.tar.gz: 31f7478f1fc2748f507c63430a6f2674828726f2
 SHA512:
-  metadata.gz: 70bc364392d8c6d5e9264d610858f4565abe5eeb0e55ba440fb76b280a65e2be8e33e78e1f7122225b0fef11c913a3425279ce91f7627ed85a2fc6ac0ff882ba
-  data.tar.gz: 50b31211b5b9e1eae9611ddf1c18e5861b2381e78a085f140a1d1d43cee831f00853ffb838c24a151519fba1d98e36340937fbf42d930f50259eaef9bc93bf26
+  metadata.gz: 7569d7793812924083b35cf74c0dc53c96e620ecd6ee376b1f82049d36cbd4e0acbea561c64161fd1f460d99e861bcedabd9575e1fa185c4a755075b15548db7
+  data.tar.gz: ba8f9c33ed6b3e0a4a25be14dea34ea881fd0353df65096fd80881ccd88b6b89787de9a1a7c65d38d0e3d95a40c9c3fe99efcd440188271db8793a073da4a702

data/README.md

@@ -36,8 +36,9 @@ Windows.
 Create a `Gemfile` in the root of your MediaWiki-related project that
 specifies the version of `mediawiki_selenium` you wish to use (typically the
 latest version).
+Replace `x.x.x` with version number from `lib/mediawiki_selenium/version.rb`.
 
-    gem 'mediawiki_selenium', '~> 1.6.3'
+    gem 'mediawiki_selenium', '~> x.x.x'
 
 Install the gem and its dependencies by running `bundle install`. (If
 [Bundler](http://bundler.io/) is not yet installed, install it with
@@ -232,7 +233,7 @@ When you're ready to cut a new release, increase the major/minor/patch version (
 - Bug fixes
 - Possible incompatibilities
 
-Update gem version in `README.md`, `UPGRADE.md` and `lib/mediawiki_selenium/version.rb`. Add release notes to `RELEASES.md`.
+Update gem version in `lib/mediawiki_selenium/version.rb`. Add release notes to `RELEASES.md`.
 
 ### Step 2
 
@@ -249,35 +250,15 @@ When the commit is merged into master branch, fetch it and verify the commit is
 
 ### Step 4
 
-Tag the commit, for example:
+This assumes you have working Ruby, RubyGems, RubyGems.org account and are an owner of the gem at the site.
 
-    $ git fetch --tags
-    $ git log --oneline --decorate
-    123abcd (HEAD, origin/master, origin/HEAD, master, T108873) Release minor version 1.5.1
-    ...
-    $ git tag 1.5.1 123abcd
-    $ git push --tags
-
-### Step 5
-
-Build the gem, for example:
-
-    $ gem build mediawiki_selenium.gemspec
-    Successfully built RubyGem
-    Name: mediawiki_selenium
-    Version: 1.5.1
-    File: mediawiki_selenium-1.5.1.gem
-
-The above gem assumes you have working Ruby and RubyGems.
-
-### Step 6
-
-Push the gem to RubyGems.org, for example:
-
-    $ gem push mediawiki_selenium-1.5.1.gem
-    ...
+Release the gem:
 
-The last step assumes you have RubyGems.org account and are owner of the gem at the site.
+    $ bundle exec rake release
+    mediawiki_selenium x.x.x built to pkg/mediawiki_selenium-x.x.x.gem.
+    Tagged vx.x.x.
+    Pushed git commits and tags.
+    Pushed mediawiki_selenium x.x.x to rubygems.org.
 
 ### Step 7
 

data/RELEASES.md

@@ -1,5 +1,9 @@
 ## Release notes
 
+### 1.6.4 2016-01-27
+
+* Log SauceLabs session URLs via Cucumber logger embeds
+
 ### 1.6.3 2015-12-15
 
 * Added support for all SauceLabs provided browsers

data/UPGRADE.md

@@ -9,8 +9,9 @@ in the root directory of your project.
 
 First, update the `Gemfile` in your project's root directory to specify the
 new version.
+Replace `x.x.x` with version number from `lib/mediawiki_selenium/version.rb`.
 
-    gem 'mediawiki_selenium', '~> 1.6.3'
+    gem 'mediawiki_selenium', '~> x.x.x'
 
 ### Update `require` paths in `env.rb`
 
@@ -36,8 +37,9 @@ if they don't apply to your test cases. The only must have is the first
 
 First, update the `Gemfile` in your project's root directory to specify the
 new version.
+Replace `x.x.x` with version number from `lib/mediawiki_selenium/version.rb`.
 
-    gem 'mediawiki_selenium', '~> 1.6.3'
+    gem 'mediawiki_selenium', '~> x.x.x'
 
 ### Upgrade gems and dependencies
 

data/lib/mediawiki_selenium.rb

@@ -4,6 +4,7 @@ module MediawikiSelenium
   autoload :BrowserFactory, 'mediawiki_selenium/browser_factory'
   autoload :ConfigurationError, 'mediawiki_selenium/configuration_error'
   autoload :Environment, 'mediawiki_selenium/environment'
+  autoload :EmbedBrowserSession, 'mediawiki_selenium/cucumber/embed_browser_session'
   autoload :HeadlessHelper, 'mediawiki_selenium/helpers/headless_helper'
   autoload :Initializer, 'mediawiki_selenium/initializer'
   autoload :LoginHelper, 'mediawiki_selenium/helpers/login_helper'

data/lib/mediawiki_selenium/cucumber/embed_browser_session.rb

@@ -0,0 +1,18 @@
+module MediawikiSelenium
+  # Embeds the browser session upon creation into the active Cucumber logger.
+  #
+  module EmbedBrowserSession
+    # Embeds the browser session into the active Cucumber logger(s) as soon as
+    # {Environment} is done creating it. Note that the
+    # 'application/vnd.webdriver-session-id' MIME used for the embedding is
+    # made up for this purpose.
+    #
+    # @see Environment#browser
+    #
+    def browser
+      super.tap do |b|
+        embed(b.driver.session_id, 'application/vnd.webdriver-session-id')
+      end
+    end
+  end
+end

data/lib/mediawiki_selenium/cucumber/env.rb

@@ -9,4 +9,5 @@ World(MediawikiSelenium::LoginHelper)
 World(MediawikiSelenium::PageFactory)
 World(MediawikiSelenium::ScreenshotHelper)
 World(MediawikiSelenium::StrictPending)
+World(MediawikiSelenium::EmbedBrowserSession)
 World(MediawikiSelenium::UserFactoryHelper)

data/lib/mediawiki_selenium/cucumber/sauce.rb

@@ -1,17 +1,28 @@
 require 'cucumber/formatter/junit'
 require 'mediawiki_selenium/remote_browser_factory'
+require 'set'
 
 module Cucumber::Formatter
   class Sauce < Junit
+    def before_steps(_steps)
+      @sids = Set.new
+
+      super
+    end
+
+    def embed(session_id, mime, _label)
+      return unless mime == 'application/vnd.webdriver-session-id'
+
+      @sids << session_id
+    end
+
     private
 
     def format_exception(exception)
-      sids = MediawikiSelenium::RemoteBrowserFactory.last_session_ids
-
-      if sids.nil? || sids.empty?
+      if @sids.nil? || @sids.empty?
         message = 'Uh-oh. Could not find link to Sauce Labs job URL.'
       else
-        message = sids.map { |sid| "Sauce Labs job URL: http://saucelabs.com/jobs/#{sid}\n" }.join
+        message = @sids.map { |sid| "Sauce Labs job URL: http://saucelabs.com/jobs/#{sid}\n" }.join
       end
 
       msgs = [message] + ["#{exception.message} (#{exception.class})"] + exception.backtrace

data/lib/mediawiki_selenium/remote_browser_factory.rb

@@ -16,37 +16,32 @@ module MediawikiSelenium
     REQUIRED_CONFIG = [:sauce_ondemand_username, :sauce_ondemand_access_key]
     URL = 'http://ondemand.saucelabs.com/wd/hub'
 
-    class << self
-      # @attr [Array] SauceLabs job IDs from the most recent sessions.
-      attr_accessor :last_session_ids
+    def self.extend_object(base)
+      return if base.is_a?(self)
 
-      def extend_object(base)
-        return if base.is_a?(self)
+      super
 
-        super
+      base.configure(:sauce_ondemand_username, :sauce_ondemand_access_key) do |user, key, options|
+        options[:url] = URI.parse(URL)
 
-        base.configure(:sauce_ondemand_username, :sauce_ondemand_access_key) do |user, key, options|
-          options[:url] = URI.parse(URL)
-
-          options[:url].user = user
-          options[:url].password = key
-        end
+        options[:url].user = user
+        options[:url].password = key
+      end
 
-        base.configure(:platform) do |platform, options|
-          options[:desired_capabilities].platform = platform
-        end
+      base.configure(:platform) do |platform, options|
+        options[:desired_capabilities].platform = platform
+      end
 
-        base.configure(:version) do |version, options|
-          options[:desired_capabilities].version = version
-        end
+      base.configure(:version) do |version, options|
+        options[:desired_capabilities].version = version
+      end
 
-        base.configure(:device_name) do |device_name, options|
-          options[:desired_capabilities]['deviceName'] = device_name
-        end
+      base.configure(:device_name) do |device_name, options|
+        options[:desired_capabilities]['deviceName'] = device_name
+      end
 
-        base.configure(:device_orientation) do |device_orientation, options|
-          options[:desired_capabilities]['deviceOrientation'] = device_orientation
-        end
+      base.configure(:device_orientation) do |device_orientation, options|
+        options[:desired_capabilities]['deviceOrientation'] = device_orientation
       end
     end
 
@@ -55,8 +50,6 @@ module MediawikiSelenium
     def teardown(env, status)
       artifacts = super
 
-      RemoteBrowserFactory.last_session_ids = []
-
       each do |browser|
         sid = browser.driver.session_id
         username = env.lookup(:sauce_ondemand_username)
@@ -75,8 +68,6 @@ module MediawikiSelenium
           }.to_json
         )
 
-        RemoteBrowserFactory.last_session_ids << sid
-
         artifacts["http://saucelabs.com/jobs/#{sid}"] = 'text/url'
       end
 

data/lib/mediawiki_selenium/version.rb

@@ -1,3 +1,3 @@
 module MediawikiSelenium
-  VERSION = '1.6.3'
+  VERSION = '1.6.4'
 end

data/mediawiki_selenium.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'syntax', '~> 1.2', '>= 1.2.0'
   spec.add_runtime_dependency 'thor', '~> 0.19', '>= 0.19.1'
 
+  spec.add_development_dependency 'rake', '~> 10.5'
   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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediawiki_selenium
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Chris McMahon
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -209,6 +209,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -358,6 +372,7 @@ files:
 - lib/mediawiki_selenium/browser_factory/phantomjs.rb
 - lib/mediawiki_selenium/configuration_error.rb
 - lib/mediawiki_selenium/cucumber.rb
+- lib/mediawiki_selenium/cucumber/embed_browser_session.rb
 - lib/mediawiki_selenium/cucumber/env.rb
 - lib/mediawiki_selenium/cucumber/hooks.rb
 - lib/mediawiki_selenium/cucumber/sauce.rb