Skip to content

Commit

Permalink
Merge pull request jhoblitt#16 from jhoblitt/feature/v0.2.3
Browse files Browse the repository at this point in the history
Feature/v0.2.3
  • Loading branch information
Joshua Hoblitt committed Jun 1, 2014
2 parents d9efd4d + 3be4bcc commit 889e77c
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 106 deletions.
34 changes: 34 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,39 @@

#### [Current]
* [6c79540](../../commit/6c79540) - __(Joshua Hoblitt)__ bump version to v0.2.3
* [e12054a](../../commit/e12054a) - __(Joshua Hoblitt)__ remove all in class/define parameter docs

Replace with URLs to section anchors in README

* [b81f8fa](../../commit/b81f8fa) - __(Joshua Hoblitt)__ fix linter warnings
* [d9efd4d](../../commit/d9efd4d) - __(Joshua Hoblitt)__ Merge pull request [#15](../../issues/15) from jhoblitt/feature/jar_2.42.1

update default selenium jar version to 2.42.1
* [3adad1c](../../commit/3adad1c) - __(Joshua Hoblitt)__ update default selenium jar version to 2.42.1
* [c46f6eb](../../commit/c46f6eb) - __(Joshua Hoblitt)__ Merge pull request [#14](../../issues/14) from jhoblitt/feature/beaker

convert from rspec-systerm -> beaker
* [c62e058](../../commit/c62e058) - __(Joshua Hoblitt)__ convert from rspec-systerm -> beaker

+ update acceptance tests

* [c500ad7](../../commit/c500ad7) - __(Joshua Hoblitt)__ Merge pull request [#13](../../issues/13) from enxebre/defaul-url
* [51e71cb](../../commit/51e71cb) - __(Joshua Hoblitt)__ fix new download URL path version component

The new download URL has the major.minor version as a path component but
excludes the .patch. Eg.

https://selenium-release.storage.googleapis.com/<major>.<minor>/selenium-server-standalone-<major>.<minor>.<patch>.jar

* [931a531](../../commit/931a531) - __(alamela)__ fixing specs
* [b9aa097](../../commit/b9aa097) - __(Enxebre)__ default url on https
* [39ac34b](../../commit/39ac34b) - __(Enxebre)__ changing borken default url

#### v0.2.2
* [d43f99c](../../commit/d43f99c) - __(Joshua Hoblitt)__ Merge pull request [#12](../../issues/12) from jhoblitt/feature/v0.2.2

Feature/v0.2.2
* [36ecd00](../../commit/36ecd00) - __(Joshua Hoblitt)__ bump version to v0.2.2
* [5f10d31](../../commit/5f10d31) - __(Joshua Hoblitt)__ minor README grammar tweak
* [48bc2ce](../../commit/48bc2ce) - __(Joshua Hoblitt)__ change README MD so class parameters are a subsection

Expand Down
2 changes: 1 addition & 1 deletion Modulefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name 'jhoblitt-selenium'
version '0.2.2'
version '0.2.3'

author 'Joshua Hoblitt <jhoblitt@cpan.org>'
license 'Apache'
Expand Down
18 changes: 0 additions & 18 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,6 @@
#
# This define should be considered private.
#
# Note that selenium::params && selnenium::install must be included in the
# manifest before this define may be used.
#
# === Parameters
#
# Accepts no parameters.
#
#
# === Examples
#
# selenium::config{ 'seleniumstandalone': }
#
#
# === Authors
#
# Joshua Hoblitt <jhoblitt@cpan.org>
#
#
define selenium::config(
$display = $selenium::params::display,
$user = $selenium::params::user,
Expand Down
25 changes: 2 additions & 23 deletions manifests/hub.pp
Original file line number Diff line number Diff line change
@@ -1,28 +1,7 @@
# == Class: selenium::hub
#
# === Parameters
#
# Note that by default `selenium::server` and `selenium::hub` will try to
# listen on the same TCP port (`4444`) and only one of them will be able to
# function.
#
# ```puppet
# # defaults
# class { 'selenium::hub':
# options => '-role hub',
# }
# ```
#
# #### `options`
#
# `String` defaults to: `-role hub`
#
# Options passed to Selenium Server Hub at startup.
#
#
# === Authors
#
# Joshua Hoblitt <jhoblitt@cpan.org>
# Please refer to https://github.com/jhoblitt/puppet-selenium#seleniumhub for
# parameter documentation.
#
#
class selenium::hub(
Expand Down
8 changes: 5 additions & 3 deletions manifests/init.pp
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# == Class: selenium
#
# Please refer to https://github.com/jhoblitt/puppet-selenium#usage for
# Please refer to https://github.com/jhoblitt/puppet-selenium#selenium for
# parameter documentation.
#
#
class selenium(
$user = $selenium::params::user,
$group = $selenium::params::group,
Expand Down Expand Up @@ -35,7 +36,8 @@
if $url {
$jar_url = $url
} else {
$jar_url = "https://selenium-release.storage.googleapis.com/${path_version}/${jar_name}"
$variant = "${path_version}/${jar_name}"
$jar_url = "https://selenium-release.storage.googleapis.com/${variant}"
}

File {
Expand All @@ -56,7 +58,7 @@

file { $log_path:
ensure => directory,
mode => 0755,
mode => '0755',
}

file { '/var/log/selenium':
Expand Down
36 changes: 2 additions & 34 deletions manifests/node.pp
Original file line number Diff line number Diff line change
@@ -1,39 +1,7 @@
# == Class: selenium::node
#
# === Parameters
#
# ```puppet
# # defaults
# class { 'selenium::node':
# display => ':0',
# options => '-Dwebdriver.enable.native.events=1 -role node',
# hub => 'http://localhost:4444/grid/register',
# }
# ```
#
# #### `display`
#
# `String` defaults to: `:0`
#
# The name of the `X` display to render too. This is set as an environment
# variable passed to Selenium Server
#
# #### `options`
#
# `String` defaults to: `-Dwebdriver.enable.native.events=1 -role node`
#
# Options passed to Selenium Server Node at startup.
#
# #### `hub`
#
# `String` defaults to: `http://localhost:4444/grid/register`
#
# The URL of the Selenium Server Hub to connect to.
#
#
# === Authors
#
# Joshua Hoblitt <jhoblitt@cpan.org>
# Please refer to https://github.com/jhoblitt/puppet-selenium#seleniumnode for
# parameter documentation.
#
#
class selenium::node(
Expand Down
29 changes: 2 additions & 27 deletions manifests/server.pp
Original file line number Diff line number Diff line change
@@ -1,32 +1,7 @@
# == Class: selenium::server
#
# === Parameters
#
# ```puppet
# # defaults
# class { 'selenium::server':
# display => ':0',
# options => '-Dwebdriver.enable.native.events=1',
# }
# ```
#
# #### `display`
#
# `String` defaults to: `:0`
#
# The name of the `X` display to render too. This is set as an environment
# variable passed to Selenium Server
#
# #### `options`
#
# `String` defaults to: `-Dwebdriver.enable.native.events=1`
#
# Options passed to Selenium Server at startup.
#
#
# === Authors
#
# Joshua Hoblitt <jhoblitt@cpan.org>
# Please refer to https://github.com/jhoblitt/puppet-selenium#seleniumserver
# for parameter documentation.
#
#
class selenium::server(
Expand Down

0 comments on commit 889e77c

Please sign in to comment.