mediawiki_selenium 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3de73bd1e6127411873532be35cc7a4a6426280c
-  data.tar.gz: b29f66ea16671e81230fac23c4be3420b687e695
+  metadata.gz: b4c692019a252a5d2657b99d2d72d06d542dfe8f
+  data.tar.gz: 628e9a09986b6e4e7e54e39199ec1271492ffdcd
 SHA512:
-  metadata.gz: 0386e7f467e71b7fcbc7be48312f72f04b87dde87ac4cf01898c5af865ca09bbbcce3ccd2258e6d480b9cf6daedf93347b74085feb9645a68d00db370802d2ea
-  data.tar.gz: abadcecf42b91744ee25e78137b96c3629b627f139e78f03575c5389991a46f8af342e1feca5dc93c5b24979bc69a4445a5642041d8229432b273e19efcd1b34
+  metadata.gz: 096ba74ed2efcc7ed0616b0242aa72f93fa39021ceeb21ee0c6628245e349433bb21567ff6fc477058cbd6f548785ae0edfb38e4b8125649a610e7f6c1217a3e
+  data.tar.gz: 5f29f41550abac61ca15c3c52804ee7ed3266b8cec19e0de11012f94ce483c50e0efa8b96c319dfb2d00a74e6f5dbf9841958e5cee05be16b910088ab4a9feb9

data/.gitignore

@@ -1,4 +1,6 @@
 .bundle
+/.yardoc/
+/doc/
 .gem
 *.gem
 Gemfile.lock

data/.yardopts

@@ -0,0 +1 @@
+--title "MediaWiki Selenium"

data/README.md

@@ -112,12 +112,15 @@ Repositories that use the gem:
 1. ArticleFeedbackv5: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/ArticleFeedbackv5), [GitHub](https://github.com/wikimedia/mediawiki-extensions-ArticleFeedbackv5), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-ArticleFeedbackv5)
 1. CirrusSearch: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/CirrusSearch), [GitHub](https://github.com/wikimedia/mediawiki-extensions-CirrusSearch), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-CirrusSearch)
 1. ContentTranslation: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/ContentTranslation), [GitHub](https://github.com/wikimedia/mediawiki-extensions-ContentTranslation), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-ContentTranslation)
+1. Echo: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Echo), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Echo), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Echo)
 1. Flow: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Flow), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Flow), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Flow)
+1. GettingStarted: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/GettingStarted), [GitHub](https://github.com/wikimedia/mediawiki-extensions-GettingStarted), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-GettingStarted)
 1. Math: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Math), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Math), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Math)
 1. mediawiki/core: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/core), [GitHub](https://github.com/wikimedia/mediawiki-core), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-core)
 1. MobileFrontend: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/MobileFrontend), [GitHub](https://github.com/wikimedia/mediawiki-extensions-MobileFrontend), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-MobileFrontend)
 1. MultimediaViewer: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/MultimediaViewer), [GitHub](https://github.com/wikimedia/mediawiki-extensions-MultimediaViewer), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-MultimediaViewer)
 1. PageTriage: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/PageTriage), [GitHub](https://github.com/wikimedia/mediawiki-extensions-PageTriage), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-PageTriage)
+1. PdfHandler: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/PdfHandler), [GitHub](https://github.com/wikimedia/mediawiki-extensions-PdfHandler), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-PdfHandler)
 1. Translate: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Translate), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Translate), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Translate)
 1. TwnMainPage: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/TwnMainPage), [GitHub](https://github.com/wikimedia/mediawiki-extensions-TwnMainPage), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-TwnMainPage)
 1. UniversalLanguageSelector: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/UniversalLanguageSelector), [GitHub](https://github.com/wikimedia/mediawiki-extensions-UniversalLanguageSelector), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-UniversalLanguageSelector)
@@ -139,6 +142,11 @@ See https://www.mediawiki.org/wiki/Gerrit
 
 ## Release notes
 
+### 0.4.0 2014-09-23
+
+* Stricter pending behavior for falsely passing steps
+* Fixed interoperability of custom browser settings and Sauce sessions
+
 ### 0.3.2 2014-08-26
 
 * Bumped runtime dependency for mediawiki_api

data/lib/mediawiki_selenium/support/env.rb

@@ -17,9 +17,13 @@ require "rest_client"
 require "watir-webdriver"
 
 require "mediawiki_selenium/support/modules/api_helper"
+require "mediawiki_selenium/support/modules/sauce_helper"
+require "mediawiki_selenium/support/modules/strict_pending"
 
 World(PageObject::PageFactory)
 World(MediawikiSelenium::ApiHelper)
+World(MediawikiSelenium::SauceHelper)
+World(MediawikiSelenium::StrictPending)
 
 def browser(test_name, configuration = nil)
   if environment == :saucelabs
@@ -76,10 +80,10 @@ def local_browser(configuration)
   set_cookie(browser)
   browser
 end
-def sauce_api(json)
+def sauce_api(json, session_id)
 RestClient::Request.execute(
   :method => :put,
-  :url => "https://saucelabs.com/rest/v1/#{ENV['SAUCE_ONDEMAND_USERNAME']}/jobs/#{$session_id}",
+  :url => "https://saucelabs.com/rest/v1/#{ENV['SAUCE_ONDEMAND_USERNAME']}/jobs/#{session_id}",
   :user => ENV["SAUCE_ONDEMAND_USERNAME"],
   :password => ENV["SAUCE_ONDEMAND_ACCESS_KEY"],
   :headers => {:content_type => "application/json"},

data/lib/mediawiki_selenium/support/hooks.rb

@@ -64,8 +64,9 @@ Before do |scenario|
   else
     @browser = browser(test_name(scenario))
     $browser = @browser # CirrusSearch and VisualEditor need this
-    $session_id = @browser.driver.instance_variable_get(:@bridge).session_id
   end
+
+  $session_id = sauce_session_id
 end
 
 After do |scenario|
@@ -80,9 +81,10 @@ After do |scenario|
   end
 
   if environment == :saucelabs
-    sauce_api(%Q{{"passed": #{scenario.passed?}}})
-    sauce_api(%Q{{"public": true}})
-    sauce_api(%Q{{"build": #{ENV["BUILD_NUMBER"]}}}) if ENV["BUILD_NUMBER"]
+    sid = $session_id || sauce_session_id
+    sauce_api(%Q{{"passed": #{scenario.passed?}}}, sid)
+    sauce_api(%Q{{"public": true}}, sid)
+    sauce_api(%Q{{"build": #{ENV["BUILD_NUMBER"]}}}, sid) if ENV["BUILD_NUMBER"]
   end
 
   if @browser

data/lib/mediawiki_selenium/support/modules/sauce_helper.rb

@@ -0,0 +1,13 @@
+module MediawikiSelenium
+  module SauceHelper
+    # The current Sauce session ID.
+    #
+    # @return [String]
+    #
+    def sauce_session_id
+      @session_id ||= @browser.driver.instance_variable_get(:@bridge).session_id if @browser
+    rescue StandardError
+      nil
+    end
+  end
+end

data/lib/mediawiki_selenium/support/modules/strict_pending.rb

@@ -0,0 +1,23 @@
+module MediawikiSelenium
+  # Implements a stricter version of `pending` that fails when a given block
+  # of expectations passes, alerting the user that the step definition should
+  # no longer be pending.
+  #
+  module StrictPending
+    class Pending < StandardError
+    end
+
+    # Delegates to Cucumber's pending but re-raises any `Cucumber::Pending`
+    # exception as a strict failure.
+    #
+    def pending(*args)
+      super
+    rescue Cucumber::Pending => e
+      if block_given?
+        raise Pending, e.message
+      else
+        raise e
+      end
+    end
+  end
+end

data/lib/mediawiki_selenium/version.rb

@@ -10,5 +10,5 @@ https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
 =end
 
 module MediawikiSelenium
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/mediawiki_selenium.gemspec

@@ -25,4 +25,7 @@ makes it easy to update the shared code.}
   spec.add_runtime_dependency "rest-client", "~> 1.6", ">= 1.6.7"
   spec.add_runtime_dependency "rspec-expectations", "~> 2.14", ">= 2.14.4"
   spec.add_runtime_dependency "syntax", "~> 1.2", ">= 1.2.0"
+
+  spec.add_development_dependency "redcarpet"
+  spec.add_development_dependency "yard"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediawiki_selenium
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris McMahon
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -169,6 +169,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   Several MediaWiki extensions share code that makes it easy to run Selenium tests. This gem
   makes it easy to update the shared code.
@@ -185,6 +213,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".gitreview"
+- ".yardopts"
 - CREDITS
 - Gemfile
 - LICENSE
@@ -198,6 +227,8 @@ files:
 - lib/mediawiki_selenium/support/env.rb
 - lib/mediawiki_selenium/support/hooks.rb
 - lib/mediawiki_selenium/support/modules/api_helper.rb
+- lib/mediawiki_selenium/support/modules/sauce_helper.rb
+- lib/mediawiki_selenium/support/modules/strict_pending.rb
 - lib/mediawiki_selenium/support/modules/url_module.rb
 - lib/mediawiki_selenium/support/pages/api_page.rb
 - lib/mediawiki_selenium/support/pages/login_page.rb