Skip to content

Commit

Permalink
Merge pull request #18 from jhoblitt/feature/beaker_update
Browse files Browse the repository at this point in the history
Feature/beaker update
  • Loading branch information
Joshua Hoblitt committed Oct 10, 2014
2 parents 889e77c + 0e51725 commit aaa9adc
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ spec/fixtures/manifests/
spec/fixtures/modules/
*.swp
.vagrant
log
4 changes: 2 additions & 2 deletions spec/acceptance/selenium_hub_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ class { 'selenium::hub': }
EOS

# Run it twice and test for idempotency
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
apply_manifest(pp, :catch_failures => true)
apply_manifest(pp, :catch_changes => true)
end
end

Expand Down
4 changes: 2 additions & 2 deletions spec/acceptance/selenium_node_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ class { 'selenium::node': }
EOS

# Run it twice and test for idempotency
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
apply_manifest(pp, :catch_failures => true)
apply_manifest(pp, :catch_changes => true)
end
end

Expand Down
4 changes: 2 additions & 2 deletions spec/acceptance/selenium_server_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ class { 'selenium::server': }
EOS

# Run it twice and test for idempotency
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
apply_manifest(pp, :catch_failures => true)
apply_manifest(pp, :catch_changes => true)
end
end

Expand Down
4 changes: 2 additions & 2 deletions spec/acceptance/selenium_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ class { 'selenium': }
EOS

# Run it twice and test for idempotency
expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
apply_manifest(pp, :catch_failures => true)
apply_manifest(pp, :catch_changes => true)
end
end

Expand Down

0 comments on commit aaa9adc

Please sign in to comment.