Skip to content

Commit

Permalink
minitest update
Browse files Browse the repository at this point in the history
  • Loading branch information
morgoth committed Jun 26, 2013
1 parent a27a81d commit 7ebf24b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 8 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
notifications:
disabled: true
before_install:
- gem install bundler
bundler_args: --without extra
rvm:
- ree
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ group :extra do
gem "debugger", :platform => [:ruby_19, :ruby_20]
end

gem "minitest", :platform => :ruby_18
gem "rake"

# xml parsers
Expand Down
5 changes: 2 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
require "bundler"
Bundler::GemHelper.install_tasks
Bundler.setup
#!/usr/bin/env rake
require "bundler/gem_tasks"

require "rake/testtask"
Rake::TestTask.new(:test) do |test|
Expand Down
1 change: 1 addition & 0 deletions alexa.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
gem.add_dependency "multi_xml", ">= 0.5.0"
gem.add_dependency "faraday", "~> 0.8.7"

gem.add_development_dependency "minitest", ">= 5.0.0"
gem.add_development_dependency "mocha"
gem.add_development_dependency "webmock"
end
4 changes: 2 additions & 2 deletions test/helper.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require "minitest/autorun"
require "webmock/minitest"
require "mocha"
require "mocha/setup"

require "alexa"

Expand All @@ -9,7 +9,7 @@
require xml_parser if ["nokogiri", "libxml", "ox"].include?(xml_parser)
MultiXml.parser = xml_parser

class MiniTest::Unit::TestCase
class MiniTest::Test
def setup
WebMock.disable_net_connect!
end
Expand Down

0 comments on commit 7ebf24b

Please sign in to comment.