mediawiki_selenium 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ff49ed757245b3019e90d0e6c97a2b1f50d0798
-  data.tar.gz: 30e39088a9deffa94072fb2d6f1b8768548c6d9c
+  metadata.gz: 01bb1e36bd275e158439389152f9f0e75df02ee6
+  data.tar.gz: 6b5c1825eeeb66c8551de98bf2de03ce8637207b
 SHA512:
-  metadata.gz: 1d2176c6a4c894d9d7e0198c5afb248a7b3a41a1f1a6d667612517133bfc3863f9f129c0d776d988196ec49c276ebae6043d6b75fe607a6909709a89fefa9c4b
-  data.tar.gz: fd7d44415b1ea8397629c44fde70f300b390924c78a33735590c211bb7b2e9413bb9686eeee73d54dda70b276b036014af2152b55147098f57de0d9c90bde510
+  metadata.gz: f600a40695ac3fa6d2876ad0458318e63b75acf15d60e072c7693a9b24bb6d05f347eaa9cc236614e848ed30bdeb779a60f8a62b8a0988005aaf96a0323b73d2
+  data.tar.gz: 03493b1449b8d70a92a1221b5e6c80a2cfe89faec2290b889b68156c36c3e7dfd0cf83b72b66ebee859b679580db818a11940f32adeb4bd80997a1fa1e28b859

data/RELEASES.md

@@ -1,5 +1,10 @@
 ## Release notes
 
+### 1.6.1 2015-09-29
+* Fixed bug in `UserFactory#user` and `UserFactory#password` that caused the
+  incorrect resolution of alternative users/passwords when in the context of
+  `Environment#as_user`
+
 ### 1.6.0 2015-09-25
 * Factored out all Cucumber specific functionality from the main framework
   classes to make way for alternative test harnesses

data/UPGRADE.md

@@ -1,18 +1,50 @@
-# Upgrading from pre-1.0 releases to 1.0.0 and above
+# Upgrading to various major and minor releases
 
-## Update your `Gemfile`
+You can check your current version by running `bundle list mediawiki_selenium`
+in the root directory of your project.
+
+## From 1.x releases to 1.6.0
+
+### Update your `Gemfile`
+
+First, update the `Gemfile` in your project's root directory to specify the
+new version.
+
+    gem 'mediawiki_selenium', '~> 1.6.0'
+
+### Update `require` paths in `env.rb`
+
+The 1.6 release of MW-Selenium decoupled much of the Cucumber specific
+implementation to make room for alternative test harnesses such as RSpec. Some
+support files were moved around to make this separation clearer.
+
+Assuming you're using Cucumber, which is still the default harness, update the
+first set of `require` statements in `tests/browser/features/support/env.rb`
+to the following.
+
+    require 'mediawiki_selenium/cucumber'
+    require 'mediawiki_selenium/pages'
+    require 'mediawiki_selenium/step_definitions'
+
+Note that you can always omit the page object and step definition statements
+if they don't apply to your test cases. The only must have is the first
+`require`.
+
+## From pre-1.0 releases to 1.x
+
+### Update your `Gemfile`
 
 First, update the `Gemfile` in your project's root directory to specify the
 new version.
 
-    gem 'mediawiki_selenium', '~> 1.5.0'
+    gem 'mediawiki_selenium', '~> 1.6.0'
 
-## Upgrade gems and dependencies
+### Upgrade gems and dependencies
 
 Now run `bundle install` to update your project's gem dependencies and
 `Gemfile.lock`.
 
-## Run the initialization script
+### Run the initialization script
 
 Version 1.0 now includes an initialization script that can help with the setup
 of new and existing test suites. Run the script in your project's root
@@ -30,11 +62,11 @@ the Cucumber environment. Since you're working with an existing test suite,
 you may run into a conflict here. Just make sure that your `env.rb` contains
 the following before anything else.
 
-    require 'mediawiki_selenium'
-    require 'mediawiki_selenium/support'
+    require 'mediawiki_selenium/cucumber'
+    require 'mediawiki_selenium/pages'
     require 'mediawiki_selenium/step_definitions'
 
-## Convert page object URLs
+### Convert page object URLs
 
 Convert all page object URLs so that they're defined relative to the root of
 any given wiki and no longer rely on the now deprecated `URL` module. In other
@@ -59,7 +91,7 @@ To something like this.
       # ...
     end
 
-## Refactor direct use of `ENV`
+### Refactor direct use of `ENV`
 
 Change all references to `ENV` to use the appropriate `Environment` method.
 
@@ -96,7 +128,7 @@ To something like:
       end
     end
 
-## Remove direct references to `@browser`
+### Remove direct references to `@browser`
 
 All references to `@browser` should use `Environment#browser` instead, since
 the latter will automatically configure and launch the browser the first time
@@ -114,7 +146,7 @@ Would be changed to:
       on(FlowPage).wait_until { browser.url =~ /Topic/ }
     end
 
-## Refactor use of deprecated `APIPage`
+### Refactor use of deprecated `APIPage`
 
 API requests should be made directly using {MediawikiSelenium::ApiHelper#api}
 which returns an instance of [MediawikiApi::Client](https://doc.wikimedia.org/rubygems/mediawiki-ruby-api/).

data/lib/mediawiki_selenium/cucumber.rb

@@ -1,3 +1,5 @@
+require 'mediawiki_selenium'
+
 require 'mediawiki_selenium/cucumber/env'
 require 'mediawiki_selenium/cucumber/hooks'
 require 'mediawiki_selenium/cucumber/sauce'

data/lib/mediawiki_selenium/environment.rb

@@ -146,7 +146,9 @@ module MediawikiSelenium
     # @yieldparam password [String] Alternative MediaWiki password.
     #
     def as_user(id, &blk)
-      with(mediawiki_user: user(id), mediawiki_password: password(id), &blk)
+      record_alternatives([:mediawiki_user, :mediawiki_password], id) do
+        with(mediawiki_user: user(id), mediawiki_password: password(id), &blk)
+      end
     end
 
     # Browser with which to drive tests.
@@ -500,13 +502,7 @@ module MediawikiSelenium
     #
     def with_alternative(names, id, &blk)
       names = Array(names)
-
-      original_alts = @_current_alternatives.dup
-      @_current_alternatives.merge!(names.each.with_object({}) { |n, alts| alts[n] = id })
-
-      with(lookup_all(names, id: id), &blk)
-    ensure
-      @_current_alternatives = original_alts
+      record_alternatives(names, id) { with(lookup_all(names, id: id), &blk) }
     end
 
     protected
@@ -529,6 +525,14 @@ module MediawikiSelenium
       key.to_s.downcase.to_sym
     end
 
+    def record_alternatives(names, id)
+      original_alts = @_current_alternatives.dup
+      @_current_alternatives.merge!(names.each.with_object({}) { |n, alts| alts[n] = id })
+      yield
+    ensure
+      @_current_alternatives = original_alts
+    end
+
     def with(overrides = {})
       overrides = normalize_config(overrides)
       original_config = @_config.dup

data/lib/mediawiki_selenium/helpers/user_factory_helper.rb

@@ -20,9 +20,19 @@ module MediawikiSelenium
     # @see Environment#password
     #
     [:user, :password].each do |name|
+      config_key = :"mediawiki_#{name}"
+
       define_method(name) do |id = nil|
         return super(id) unless lookup(:user_factory, default: false)
-        factory.create(id || current_alternative(:"mediawiki_#{name}"))[name]
+
+        alt_id = current_alternative(config_key)
+
+        # When in the context of an alternative, try the explicit value first
+        if !alt_id.nil? && alt_id == id
+          lookup(config_key, default: -> { factory.create(alt_id)[name] })
+        else
+          factory.create(id || alt_id)[name]
+        end
       end
     end
 

data/lib/mediawiki_selenium/version.rb

@@ -1,3 +1,3 @@
 module MediawikiSelenium
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
 end

data/spec/user_factory_helper_spec.rb

@@ -40,7 +40,17 @@ module MediawikiSelenium
             it 'should be different from the primary account' do
               expect(api).to receive(:create_account).twice
 
-              expect(subject).not_to eq(env.user)
+              expect(subject).not_to eq(env.send(method))
+            end
+          end
+
+          context 'within the implicit context of an alternative' do
+            subject { env.as_user(:b) { env.send(method) } }
+
+            it 'should use the already created alternative' do
+              expect(api).to receive(:create_account).twice
+
+              expect(subject).not_to eq(env.send(method))
             end
           end
         end

data/templates/tests/browser/features/support/env.rb

@@ -1,5 +1,3 @@
-require 'mediawiki_selenium'
-
 require 'mediawiki_selenium/cucumber'
 require 'mediawiki_selenium/pages'
 require 'mediawiki_selenium/step_definitions'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediawiki_selenium
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Chris McMahon
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber