mediawiki_selenium 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 726360dc3c099dde3ad6827c181be19adbfa5e54
-  data.tar.gz: f6e3f6a52f72b471183508046d9b59f48af103bd
+  metadata.gz: 329d08a407bf34d62782833f29ddc148c36e75c0
+  data.tar.gz: 34f4f2700b159884ddb8b5e6ddf77c935c8fd9ee
 SHA512:
-  metadata.gz: fb1180596eb74635fa300f438453f691d69dcdc31cb880e01e1eaf863416c68f20f9291aaf294ddfd876f8a96eae6399361fcc35ddbbcdbbd9ea39c3d1d49ae2
-  data.tar.gz: 44e1fb0e9c836131336baf5015fa8875c48cd2b293b6db05aa832db1a5b9233370070d73b550bb9914992f50063d3fccd06f198fb8e239f52b0c2ae67a279f4c
+  metadata.gz: b87efa97ee1d7ad227c7d30264daf1b1144a0cedaf3ccb46495a5a68081781fe8ae4cab1db855d7b5dfce880c7ede665e3de58736a4582a521c847c1f16b43e3
+  data.tar.gz: 84993de521a0a42243a8420d91fdb6a41eef45abbc9281a356197968715652b9b5fad2f809799ec5d716b18e4e081da249c8dd248d3865baff9d26be6aea78b8

data/README.md

@@ -37,7 +37,7 @@ 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).
 
-    gem 'mediawiki_selenium', '~> 1.3.0'
+    gem 'mediawiki_selenium', '~> 1.4.0'
 
 Install the gem and its dependencies by running `bundle install`. (If
 [Bundler](http://bundler.io/) is not yet installed, install it with
@@ -169,6 +169,30 @@ behavior.
     # Keep xvfb running after execution (the default is to kill it)
     HEADLESS_DESTROY_AT_EXIT=false bundle exec cucumber ...
 
+### User Factory
+
+Setting `user_factory` to `true` for an environment in your `environments.yml`
+will enable the {MediawikiSelenium::UserFactoryHelper} module. The module
+automatically creates accounts referenced in tests (calls to the `user`,
+`password`, or `as_user` methods) using the MW API, and randomizes the actual
+user names.
+
+These randomized fixtures can greatly improve the atomicity/isolation of your
+scenarios, ensuring control over the initial user state (e.g. an edit count
+of 0) or allowing scenarios to run in parallel on the same MW installation.
+
+Note that using this feature will result in a large number of accounts being
+created for each run. You'll typically want to enable this feature only for
+environments like CI (`integration`) or perhaps your local MW-Vagrant.
+
+    integration:
+      user_factory: true
+      # ...
+
+    mw-vagrant-host:
+      user_factory: true
+      # ...
+
 ### Screenshots
 
 You can get screenshots on failures by setting the environment
@@ -199,9 +223,17 @@ See https://www.mediawiki.org/wiki/Gerrit
 
 ## Release notes
 
+### 1.4.0 2015-06-26
+* New user factory module provides account fixtures for a greater level of
+  isolation/atomicity between scenarios
+* Updated MediaWiki API client and Cucumber dependencies for various fixes
+* Fixed `PageFactory#on` for cases where it's used before browser
+  initialization
+* Implemented integration tests that run against a MediaWiki instance in CI
+
 ### 1.3.0 2015-06-10
-* Added {Mediawiki::Environment#override} for overriding environment
-  configuration at runtime
+* Added `Environment#override` for overriding environment configuration at
+  runtime
 * Removed deprecated `APIPage` page object and updated upgrade docs
 
 ### 1.2.1 2015-06-02

data/UPGRADE.md

@@ -5,7 +5,7 @@
 First, update the `Gemfile` in your project's root directory to specify the
 new version.
 
-    gem 'mediawiki_selenium', '~> 1.3.0'
+    gem 'mediawiki_selenium', '~> 1.4.0'
 
 ## Upgrade gems and dependencies
 

data/features/api.feature

@@ -0,0 +1,15 @@
+@integration
+Feature: MW API helper
+
+  Background:
+    Given I have configured my environment from `ENV` and with:
+      """
+      user_factory: true
+      """
+      And I have set "MEDIAWIKI_URL" in my shell
+      And I am using the user factory
+      And I am using the API helper
+
+  Scenario: API helper automatically authenticates
+    When I access the API helper
+    Then the API client should have authenticated

data/features/basic_usage.feature

@@ -0,0 +1,27 @@
+@integration
+Feature: Basic usage
+
+  Background:
+    Given I have configured my environment from `ENV` and with:
+      """
+      browser: phantomjs
+      """
+      And I have set "MEDIAWIKI_URL" in my shell
+      And I am using a local browser
+
+  Scenario: The configured browser is used
+    When I start interacting with the browser
+    Then the browser name is `:phantomjs`
+
+  Scenario: Browsers are started on-demand
+    When I start interacting with the browser
+    Then the browser is open
+
+  Scenario: Browsers are closed automatically
+    Given I have started a browser
+    When teardown is called
+    Then the browser should have closed
+
+  Scenario: Navigating to the wiki
+    When I navigate to the `wiki_url`
+    Then the wiki page should have loaded

data/features/saucelabs.feature

@@ -0,0 +1,14 @@
+Feature: Remote browser sessions through SauceLabs
+
+  Background:
+    Given I have configured my environment from `ENV` and with:
+      """
+      browser: firefox
+      platform: linux
+      """
+
+  Scenario: SauceLabs sessions start just like a normal browser
+    Given I have set "SAUCE_ONDEMAND_USERNAME" in my shell
+      And I have set "SAUCE_ONDEMAND_ACCESS_KEY" in my shell
+    When I start interacting with the browser
+    Then the browser is open

data/features/step_definitions/api_helper_steps.rb

@@ -0,0 +1,11 @@
+Given(/^I am using the API helper$/) do
+  @env.extend(MediawikiSelenium::ApiHelper)
+end
+
+When(/^I access the API helper$/) do
+  @env.api
+end
+
+Then(/^the API client should have authenticated$/) do
+  expect(@env.api).to be_logged_in
+end

data/features/step_definitions/browser_steps.rb

@@ -0,0 +1,37 @@
+require 'uri'
+
+Given(/^I have started a browser$/) do
+  @env.browser
+end
+
+Given(/^I am using a local browser$/) do
+  allow(@env).to receive(:remote?).and_return(false)
+end
+
+When(/^I start interacting with the browser$/) do
+  @env.browser
+end
+
+When(/^I navigate to the `wiki_url`$/) do
+  @env.browser.goto @env.wiki_url
+end
+
+When(/^teardown is called$/) do
+  @env.teardown
+end
+
+Then(/^the browser is open$/) do
+  expect(@env.browser).to exist
+end
+
+Then(/^the wiki page should have loaded$/) do
+  expect(@env.browser.element(tag_name: 'body', class: 'mediawiki')).to be_present
+end
+
+Then(/^the browser should have closed$/) do
+  expect(@env.browser).to_not exist
+end
+
+Then(/^the browser name is `:(.*?)`$/) do |type|
+  expect(@env.browser.name).to eq(type.to_sym)
+end

data/features/step_definitions/environment_steps.rb

@@ -0,0 +1,22 @@
+Given(/^I have configured my environment with:$/) do |yaml|
+  @env = MediawikiSelenium::Environment.new(YAML.load(yaml))
+end
+
+Given(/^I have configured my environment from `ENV`(?: and with:)?$/) do |*args|
+  configs = [ENV]
+  configs << YAML.load(args.first) if args.length > 0
+
+  @env = MediawikiSelenium::Environment.new(*configs)
+end
+
+Given(/^I have set "(.*?)" in my shell$/) do |var|
+  begin
+    @env.lookup(var)
+  rescue MediawikiSelenium::ConfigurationError
+    pending "you must configure #{var.upcase} to run this test"
+  end
+end
+
+After do
+  @env.teardown unless @env.nil?
+end

data/features/step_definitions/user_factory_steps.rb

@@ -0,0 +1,22 @@
+Given(/^I am using the user factory$/) do
+  @env.extend(MediawikiSelenium::ApiHelper, MediawikiSelenium::UserFactoryHelper)
+end
+
+When(/^I reference the primary user$/) do
+  @user = @env.user
+end
+
+When(/^I reference user "(.*?)"$/) do |id|
+  @user = @env.user(id)
+end
+
+Then(/^an account for the user should exist$/) do
+  @users = @env.api.query(list: 'users', ususers: @user).data['users']
+
+  expect(@users).to be_a(Array)
+  expect(@users.first).to include('name')
+end
+
+Then(/^the user name should start with "(.*?)"$/) do |prefix|
+  expect(@users.first['name']).to start_with(prefix)
+end

data/features/support/env.rb

@@ -0,0 +1,7 @@
+require 'rspec/mocks'
+require 'mediawiki_selenium'
+
+World(RSpec::Mocks::ExampleMethods)
+
+Before { RSpec::Mocks.setup }
+After { RSpec::Mocks.teardown }

data/features/user_factory.feature

@@ -0,0 +1,20 @@
+@integration
+Feature: User factory
+
+  Background:
+    Given I have configured my environment from `ENV` and with:
+      """
+      user_factory: true
+      """
+      And I have set "MEDIAWIKI_URL" in my shell
+      And I am using the user factory
+
+  Scenario: User factory creates the primary account
+    When I reference the primary user
+    Then an account for the user should exist
+      And the user name should start with "User-"
+
+  Scenario: User factory creates an alternative account
+    When I reference user "some_user"
+    Then an account for the user should exist
+      And the user name should start with "User-some-user-"

data/lib/mediawiki_selenium.rb

@@ -8,4 +8,6 @@ module MediawikiSelenium
   autoload :PageFactory, 'mediawiki_selenium/page_factory'
   autoload :Raita, 'mediawiki_selenium/raita'
   autoload :RemoteBrowserFactory, 'mediawiki_selenium/remote_browser_factory'
+  autoload :UserFactory, 'mediawiki_selenium/user_factory'
+  autoload :UserFactoryHelper, 'mediawiki_selenium/support/modules/user_factory_helper'
 end

data/lib/mediawiki_selenium/environment.rb

@@ -103,6 +103,7 @@ module MediawikiSelenium
     def initialize(*configs)
       @_config = configs.map { |config| normalize_config(config) }.reduce(:merge)
       @_factory_cache = {}
+      @_current_alternatives = {}
     end
 
     # Whether the given environment is equal to this one. Two environments are
@@ -143,10 +144,7 @@ module MediawikiSelenium
     # @yieldparam password [String] Alternative MediaWiki password.
     #
     def as_user(id, &blk)
-      user = lookup(:mediawiki_user, id: id)
-      password = lookup(:mediawiki_password, id: id, default: -> { lookup(:mediawiki_password) })
-
-      with(mediawiki_user: user, mediawiki_password: password, &blk)
+      with(mediawiki_user: user(id), mediawiki_password: password(id), &blk)
     end
 
     # Browser with which to drive tests.
@@ -180,6 +178,14 @@ module MediawikiSelenium
       lookup(:browser, default: 'firefox').downcase.to_sym
     end
 
+    # Returns the current alternate ID for the given configuration key.
+    #
+    # @param key [Symbol] Configuration key.
+    #
+    def current_alternative(key)
+      @_current_alternatives[key]
+    end
+
     # A reference to this environment. Can be used in conjunction with {#[]}
     # for syntactic sugar in looking up environment configuration where `self`
     # would otherwise seem ambiguous.
@@ -317,7 +323,7 @@ module MediawikiSelenium
     # @return [String]
     #
     def password(id = nil)
-      lookup(:mediawiki_password, id: id)
+      lookup(:mediawiki_password, id: id, default: -> { lookup(:mediawiki_password) })
     end
 
     # Whether this environment has been configured to use remote browser
@@ -461,7 +467,14 @@ module MediawikiSelenium
     # @yield [*args] Values of the overridden configuration.
     #
     def with_alternative(names, id, &blk)
-      with(lookup_all(Array(names), id: 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
     end
 
     protected

data/lib/mediawiki_selenium/page_factory.rb

@@ -14,7 +14,7 @@ module MediawikiSelenium
     # @see http://www.rubydoc.info/github/cheezy/page-object
     #
     def on_page(page_class, params = { using_params: {} }, visit = false)
-      @browser = browser if visit
+      @browser = browser if visit || !defined?(@browser)
 
       super(page_class, params, false) do |page|
         if page.respond_to?(:goto)

data/lib/mediawiki_selenium/support/env.rb

@@ -11,3 +11,4 @@ World { MediawikiSelenium::Environment.load_default }
 World(MediawikiSelenium::ApiHelper)
 World(MediawikiSelenium::PageFactory)
 World(MediawikiSelenium::StrictPending)
+World(MediawikiSelenium::UserFactoryHelper)

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

@@ -12,15 +12,23 @@ module MediawikiSelenium
     def api
       @_api_cache ||= {}
 
-      url = lookup(:mediawiki_api_url, default: api_url_from(lookup(:mediawiki_url)))
+      url = api_url
 
       @_api_cache[[url, user]] ||= MediawikiApi::Client.new(url).tap do |client|
         client.log_in(user, password)
       end
     end
 
+    # URL to the API endpoint for the current wiki.
+    #
+    # @return [String]
+    #
+    def api_url
+      lookup(:mediawiki_api_url, default: -> { api_url_from(lookup(:mediawiki_url)) })
+    end
+
     # Ensures the given alternative account exists by attempting to create it
-    # via the API.  Any errors related to the account already existing are
+    # via the API. Any errors related to the account already existing are
     # swallowed.
     #
     # @param id [Symbol] ID of alternative user.

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

@@ -0,0 +1,35 @@
+require 'mediawiki_api'
+
+module MediawikiSelenium
+  # Provisions user accounts automatically using the MW API upon their first
+  # reference.
+  #
+  # Note you must explicitly enable this functionality by setting
+  # `user_factory` to `true` in your `environments.yml` configuration file.
+  #
+  # @see Environment
+  # @see UserFactory
+  #
+  module UserFactoryHelper
+    # @!method user
+    # @!method password
+    #
+    # Create account upon the first reference to its username or password.
+    #
+    # @see Environment#user
+    # @see Environment#password
+    #
+    [:user, :password].each do |name|
+      define_method(name) do |id = nil|
+        return super(id) unless lookup(:user_factory, default: false)
+        factory.create(id || current_alternative(:"mediawiki_#{name}"))[name]
+      end
+    end
+
+    private
+
+    def factory
+      @_user_factory ||= UserFactory.new(MediawikiApi::Client.new(api_url))
+    end
+  end
+end

data/lib/mediawiki_selenium/user_factory.rb

@@ -0,0 +1,50 @@
+require 'mediawiki_api'
+
+module MediawikiSelenium
+  # Factory class used to provision test user fixtures via the MW API.
+  #
+  class UserFactory
+    # Create a user factory. This should typically be done anew for each test
+    # case.
+    #
+    # @param api [MediawikiApi::Client] API client used to create users.
+    #
+    def initialize(api)
+      @api = api
+      @users = {}
+    end
+
+    # Return a unique name for the given user ID. Each account will be created
+    # via the MW API if it has not already been created.
+    #
+    # @param id [Symbol, nil] Alternative ID or `nil` for the primary user.
+    #
+    # @return [Hash]
+    #
+    def create(id = nil)
+      return @users[id] if @users.include?(id)
+
+      user = unique(id, 'User')
+      pass = unique(id, 'Pass')
+
+      create_account(user, pass)
+
+      @users[id] = { user: user, password: pass }
+    end
+
+    private
+
+    def create_account(user, password)
+      @api.create_account(user, password)
+    rescue MediawikiApi::ApiError => e
+      raise e unless e.code == 'userexists'
+    end
+
+    def unique(id, label)
+      prefix = label
+      prefix += "-#{id.to_s.gsub('_', '-')}" if id
+
+      "#{prefix}-#{Random.rand(36**10).to_s(36)}"
+    end
+  end
+end

data/lib/mediawiki_selenium/version.rb

@@ -1,3 +1,3 @@
 module MediawikiSelenium
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

data/mediawiki_selenium.gemspec

@@ -27,10 +27,10 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'cucumber', '~> 1.3', '>= 1.3.10'
+  spec.add_runtime_dependency 'cucumber', '~> 1.3', '>= 1.3.20'
   spec.add_runtime_dependency 'headless', '~> 1.0', '>= 1.0.1'
   spec.add_runtime_dependency 'json', '~> 1.8', '>= 1.8.1'
-  spec.add_runtime_dependency 'mediawiki_api', '~> 0.2', '>= 0.2.1'
+  spec.add_runtime_dependency 'mediawiki_api', '~> 0.4', '>= 0.4.1'
   spec.add_runtime_dependency 'page-object', '~> 1.0'
   spec.add_runtime_dependency 'rest-client', '~> 1.6', '>= 1.6.7'
   spec.add_runtime_dependency 'rspec-expectations', '~> 2.14', '>= 2.14.4'

data/spec/environment_spec.rb

@@ -23,6 +23,10 @@ module MediawikiSelenium
     let(:mediawiki_user) { 'mw user' }
     let(:mediawiki_password) { 'mw password' }
 
+    def mock_environment_name(name)
+      expect(ENV).to receive(:[]).with('MEDIAWIKI_ENVIRONMENT').and_return(name)
+    end
+
     describe '.load' do
       subject { Environment.load(name, extra) }
 
@@ -65,14 +69,14 @@ module MediawikiSelenium
       subject { Environment.load_default }
 
       it 'loads the environment configuration specified by MEDIAWIKI_ENVIRONMENT' do
-        expect(ENV).to receive(:[]).with('MEDIAWIKI_ENVIRONMENT').and_return('foo')
+        mock_environment_name('foo')
         expect(Environment).to receive(:load).with('foo', ENV)
         subject
       end
 
       context 'where MEDIAWIKI_ENVIRONMENT is not defined' do
         it 'looks for a "default" environment' do
-          expect(ENV).to receive(:[]).with('MEDIAWIKI_ENVIRONMENT').and_return(nil)
+          mock_environment_name(nil)
           expect(Environment).to receive(:load).with('default', ENV)
           subject
         end
@@ -232,6 +236,42 @@ module MediawikiSelenium
       end
     end
 
+    describe '#current_alternative' do
+      subject { env.current_alternative(key) }
+
+      let(:key) { :foo }
+      let(:config) { { foo: 'a', foo_b: 'b', foo_c: 'c' } }
+
+      context 'when there is no active alternative' do
+        it { is_expected.to be(nil) }
+      end
+
+      context 'when there is an active alternative' do
+        it 'should return the alternative ID' do
+          env.with_alternative([key], :b) do
+            expect(subject).to eq(:b)
+          end
+        end
+      end
+
+      context 'when there are nested active alternatives' do
+        it 'should return the latest alternative ID' do
+          env.with_alternative([key], :b) do
+            env.with_alternative([key], :c) do
+              expect(subject).to eq(:c)
+            end
+          end
+        end
+
+        it 'properly restores the active alternatives for each level of nesting' do
+          env.with_alternative([key], :b) do
+            env.with_alternative([key], :c)
+            expect(subject).to eq(:b)
+          end
+        end
+      end
+    end
+
     describe '#env' do
       subject { env.env }
 

data/spec/page_factory_spec.rb

@@ -17,6 +17,10 @@ module MediawikiSelenium
 
       let(:browser) { double('Watir::Browser') }
 
+      before do
+        allow(env).to receive(:browser).and_return(browser)
+      end
+
       it 'returns a new page object' do
         page = double('PageObject')
         expect(page_class).to receive(:new).and_return(page)
@@ -33,6 +37,14 @@ module MediawikiSelenium
         end
       end
 
+      context 'when the browser has not yet been initialized' do
+        it 'initializes a browser' do
+          allow(page_class).to receive(:new)
+          expect(env).to receive(:browser).and_return(browser)
+          subject
+        end
+      end
+
       context 'when told to visit a page' do
         let(:visit) { true }
         let(:config) { { mediawiki_url: 'http://an.example/wiki/' } }

data/spec/user_factory_helper_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+module MediawikiSelenium
+  describe UserFactoryHelper do
+    let(:env) { Environment.new(config).extend(ApiHelper, UserFactoryHelper) }
+
+    let(:api_url) { 'http://an.example/api' }
+    let(:api) { double('MediawikiApi::Client') }
+
+    [:user, :password].each do |method|
+      describe "##{method}" do
+        subject { env.send(method, id) }
+
+        context 'when the `user_factory` option is enabled' do
+          let(:config) { { mediawiki_api_url: api_url, user_factory: true } }
+
+          before do
+            expect(MediawikiApi::Client).to receive(:new).with(api_url).and_return(api)
+          end
+
+          context 'given no alternative ID' do
+            let(:id) { nil }
+
+            it 'creates the primary account and returns the name' do
+              expect(api).to receive(:create_account)
+
+              expect(subject).to be_a(String)
+            end
+          end
+
+          context 'given an existing alternative ID' do
+            let(:id) { :b }
+
+            it 'creates the alternative account and returns the name' do
+              expect(api).to receive(:create_account)
+
+              expect(subject).to be_a(String)
+            end
+
+            it 'should be different from the primary account' do
+              expect(api).to receive(:create_account).twice
+
+              expect(subject).not_to eq(env.user)
+            end
+          end
+        end
+
+        context 'when the `user_factory` option is not enabled' do
+          let(:config) { { mediawiki_api_url: api_url, user_factory: false } }
+          let(:id) { nil }
+
+          it "delegates to `Environment##{method}`" do
+            expect { subject }.to raise_error(ConfigurationError)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/user_factory_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+module MediawikiSelenium
+  describe UserFactory do
+    subject { factory }
+
+    let(:factory) { UserFactory.new(api) }
+    let(:api) { double('MediawikiApi::Client') }
+
+    it { is_expected.to be_a(UserFactory) }
+
+    describe '#create' do
+      let(:rando) { 'x' * 10 }
+
+      before do
+        n = double('Fixnum')
+        allow(Random).to receive(:rand).and_return(n)
+        allow(n).to receive(:to_s).with(36).and_return(rando)
+      end
+
+      context 'given no ID' do
+        it 'creates a new user like "User--<random 10 chars>"' do
+          expect(api).to receive(:create_account).
+            with("User-#{rando}", "Pass-#{rando}")
+
+          factory.create
+        end
+
+        it 'returns the user name and password' do
+          allow(api).to receive(:create_account)
+
+          expect(factory.create).to eq(user: "User-#{rando}", password: "Pass-#{rando}")
+        end
+      end
+
+      context 'given an ID' do
+        it 'creates a new user like "User-<id>-<random 10 chars>"' do
+          expect(api).to receive(:create_account).
+            with("User-foo-#{rando}", "Pass-foo-#{rando}")
+
+          factory.create(:foo)
+        end
+
+        it 'replaces underscores in IDs with dashes' do
+          expect(api).to receive(:create_account).
+            with("User-foo-bar-#{rando}", "Pass-foo-bar-#{rando}")
+
+          factory.create(:foo_bar)
+        end
+
+        it 'returns the alternative user name and password' do
+          allow(api).to receive(:create_account)
+
+          expect(factory.create(:foo)).
+            to eq(user: "User-foo-#{rando}", password: "Pass-foo-#{rando}")
+        end
+      end
+
+      context 'called more than once' do
+        it 'will not create the same account twice' do
+          expect(api).to receive(:create_account).once.
+            with("User-foo-#{rando}", "Pass-foo-#{rando}")
+
+          factory.create(:foo)
+          factory.create(:foo)
+        end
+
+        it 'returns the same user and password' do
+          expect(api).to receive(:create_account).
+            with("User-foo-#{rando}", "Pass-foo-#{rando}")
+
+          expect(factory.create(:foo)).to be(factory.create(:foo))
+        end
+      end
+    end
+  end
+end

data/templates/tests/browser/environments.yml

@@ -15,14 +15,12 @@
 #   bundle exec cucumber
 #
 mw-vagrant-host: &default
+  user_factory: true
   mediawiki_url: http://127.0.0.1:8080/wiki/
-  mediawiki_user: Selenium_user
-  mediawiki_password: vagrant
 
 mw-vagrant-guest:
+  user_factory: true
   mediawiki_url: http://127.0.0.1/wiki/
-  mediawiki_user: Selenium_user
-  mediawiki_password: vagrant
 
 beta:
   mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/
@@ -34,4 +32,8 @@ test2:
   mediawiki_user: Selenium_user
   # mediawiki_password: SET THIS IN THE ENVIRONMENT!
 
+integration:
+  user_factory: true
+  # mediawiki_url: THIS WILL BE SET BY JENKINS
+
 default: *default

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediawiki_selenium
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Chris McMahon
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -24,7 +24,7 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: 1.3.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: 1.3.20
 - !ruby/object:Gem::Dependency
   name: headless
   requirement: !ruby/object:Gem::Requirement
@@ -81,20 +81,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: page-object
   requirement: !ruby/object:Gem::Requirement
@@ -330,6 +330,15 @@ files:
 - README.md
 - UPGRADE.md
 - bin/mediawiki-selenium-init
+- features/api.feature
+- features/basic_usage.feature
+- features/saucelabs.feature
+- features/step_definitions/api_helper_steps.rb
+- features/step_definitions/browser_steps.rb
+- features/step_definitions/environment_steps.rb
+- features/step_definitions/user_factory_steps.rb
+- features/support/env.rb
+- features/user_factory.feature
 - lib/mediawiki_selenium.rb
 - lib/mediawiki_selenium/browser_factory.rb
 - lib/mediawiki_selenium/browser_factory/base.rb
@@ -356,11 +365,13 @@ files:
 - lib/mediawiki_selenium/support/hooks.rb
 - lib/mediawiki_selenium/support/modules/api_helper.rb
 - lib/mediawiki_selenium/support/modules/strict_pending.rb
+- lib/mediawiki_selenium/support/modules/user_factory_helper.rb
 - lib/mediawiki_selenium/support/pages.rb
 - lib/mediawiki_selenium/support/pages/login_page.rb
 - lib/mediawiki_selenium/support/pages/random_page.rb
 - lib/mediawiki_selenium/support/pages/reset_preferences_page.rb
 - lib/mediawiki_selenium/support/sauce.rb
+- lib/mediawiki_selenium/user_factory.rb
 - lib/mediawiki_selenium/version.rb
 - lib/mediawiki_selenium/warnings_formatter.rb
 - mediawiki_selenium.gemspec
@@ -373,6 +384,8 @@ files:
 - spec/page_factory_spec.rb
 - spec/remote_browser_factory_spec.rb
 - spec/spec_helper.rb
+- spec/user_factory_helper_spec.rb
+- spec/user_factory_spec.rb
 - templates/tests/browser/environments.yml
 - templates/tests/browser/features/support/env.rb
 homepage: https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/selenium