diff --git a/README.md b/README.md index a25dda5..bb75a8a 100644 --- a/README.md +++ b/README.md @@ -194,7 +194,7 @@ class { 'selenium': group => 'selenium', install_root => '/opt/selenium', java => 'java', - version => '2.41.0', + version => '2.42.1', url => undef, download_timeout => '90', } @@ -228,7 +228,7 @@ The path of the `java` interpreter to use. ##### `version` -`String` defaults to: `2.41.0` (the latest release as of 2014-05-22) +`String` defaults to: `2.42.1` (the latest release as of 2014-05-31) The version of Selenium Server to download. Used to form the URL used to fetch the jar file. diff --git a/manifests/params.pp b/manifests/params.pp index ee5fb2a..3d37c4a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -12,7 +12,7 @@ $hub_options = '-role hub' $node_options = "${server_options} -role node" $java = 'java' - $version = '2.41.0' + $version = '2.42.1' $default_hub = 'http://localhost:4444/grid/register' $download_timeout = '90' diff --git a/spec/acceptance/selenium_spec.rb b/spec/acceptance/selenium_spec.rb index 06ded2a..0930e58 100644 --- a/spec/acceptance/selenium_spec.rb +++ b/spec/acceptance/selenium_spec.rb @@ -30,7 +30,7 @@ class { 'selenium': } it { should be_linked_to '/opt/selenium/log' } end - describe file('/opt/selenium/jars/selenium-server-standalone-2.41.0.jar') do + describe file("/opt/selenium/jars/selenium-server-standalone-#{DEFAULT_VERSION}.jar") do it { should be_file } it { should be_owned_by 'selenium' } it { should be_grouped_into 'selenium' } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2c6f566..2ec38dd 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1 +1,2 @@ require 'puppetlabs_spec_helper/module_spec_helper' +require 'spec_helper_common' diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index cf6c5e0..0ebf390 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,5 +1,6 @@ require 'beaker-rspec/spec_helper' require 'beaker-rspec/helpers/serverspec' +require 'spec_helper_common' unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no' if hosts.first.is_pe? diff --git a/spec/spec_helper_common.rb b/spec/spec_helper_common.rb new file mode 100644 index 0000000..314857c --- /dev/null +++ b/spec/spec_helper_common.rb @@ -0,0 +1 @@ +DEFAULT_VERSION = '2.42.1' diff --git a/spec/unit/classes/selenium_spec.rb b/spec/unit/classes/selenium_spec.rb index 80930b8..311d3e9 100644 --- a/spec/unit/classes/selenium_spec.rb +++ b/spec/unit/classes/selenium_spec.rb @@ -9,7 +9,7 @@ :group => 'selenium', :install_root => '/opt/selenium', :java => 'java', - :version => '2.41.0', + :version => DEFAULT_VERSION, :url => '', :download_timeout => '90', } diff --git a/spec/unit/defines/selenium_config_spec.rb b/spec/unit/defines/selenium_config_spec.rb index 3cee50f..3ac7dc1 100644 --- a/spec/unit/defines/selenium_config_spec.rb +++ b/spec/unit/defines/selenium_config_spec.rb @@ -10,7 +10,7 @@ :display => ':0', :user => 'selenium', :install_root => '/opt/selenium', - :jar_name => 'selenium-server-standalone-2.41.0.jar', + :jar_name => "selenium-server-standalone-#{DEFAULT_VERSION}.jar", :options => '-Dwebdriver.enable.native.events=1', :java => 'java', }