Skip to content

Commit

Permalink
Merge pull request #22 from leftathome/travis_fixes
Browse files Browse the repository at this point in the history
XML validation of root request, bundler updates
  • Loading branch information
Brian Scott committed Aug 17, 2013
2 parents c133341 + 7c0146c commit 12a8c79
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
4 changes: 3 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ PATH
GEM
remote: http://rubygems.org/
specs:
chef (11.4.4)
chef (11.6.0)
erubis
highline (>= 1.6.9)
json (>= 1.4.4, <= 1.7.7)
Expand Down Expand Up @@ -47,6 +47,7 @@ GEM
net-ssh-multi (1.1)
net-ssh (>= 2.1.4)
net-ssh-gateway (>= 0.99.0)
nokogiri (1.5.10)
ohai (6.16.0)
ipaddress
mixlib-cli
Expand Down Expand Up @@ -88,6 +89,7 @@ PLATFORMS
DEPENDENCIES
chef-rundeck!
jeweler
nokogiri
rack-test
rspec (>= 1.2.9)
yard
1 change: 1 addition & 0 deletions chef-rundeck.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ Gem::Specification.new do |s|
s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
s.add_development_dependency(%q<yard>, [">= 0"])
s.add_development_dependency(%q<rack-test>, [">= 0"])
s.add_development_dependency(%q<nokogiri>, [">= 0"])
else
s.add_dependency(%q<sinatra>, [">= 0"])
s.add_dependency(%q<chef>, [">= 0"])
Expand Down
12 changes: 9 additions & 3 deletions spec/chef-rundeck_spec.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
require 'spec_helper'
require 'nokogiri'

describe 'ChefRundeck' do
it 'should return false' do
before do
# setup for the following tests
ChefRundeck.config_file = "#{ENV['TRAVIS_BUILD_DIR']}/spec/support/client.rb"
ChefRundeck.username = ENV['USER']
ChefRundeck.web_ui_url = 'https://manage.opscode.com'
ChefRundeck.configure

end
it 'fetch to root should return 200' do
get '/'
last_response.should be_ok
end

it 'fetched document should be Nokogiri-parseable XML document' do
get '/'
Nokogiri::XML(last_response.body).document.should be_true
end
end

0 comments on commit 12a8c79

Please sign in to comment.