Merge pull request #13 from dasch/dasch/cleanup

Make the tests work again

Author: dasch

.travis.yml

@@ -2,4 +2,4 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.1

Gemfile

@@ -1,5 +1,3 @@
 source "http://rubygems.org"
 
 gemspec
-
-gem "shoulda", :git => "git://github.com/dasch/shoulda.git", :branch => "minitest"

test/bittorrent_test.rb

@@ -1,7 +1,7 @@
 require 'environment'
 
-class BitTorrentTest < MiniTest::Unit::TestCase
-  should "load a bencoded torrent file" do
+describe "bittorrent" do
+  it "should load a bencoded torrent file" do
     BEncode.load_file("test/fixtures/python.torrent")
     pass
   end

test/decoding_test.rb

@@ -1,19 +1,17 @@
 require 'environment'
 
-class DecodingTest < MiniTest::Unit::TestCase
-  context "The BEncode decoder" do
-    should_decode 42, "i42e"
-    should_decode 0, "i0e"
-    should_decode -42, "i-42e"
+describe "decoding" do
+  it_should_decode 42, "i42e"
+  it_should_decode 0, "i0e"
+  it_should_decode -42, "i-42e"
 
-    should_decode "foo", "3:foo"
-    should_decode "", "0:"
+  it_should_decode "foo", "3:foo"
+  it_should_decode "", "0:"
 
-    should_decode [1, 2, 3], "li1ei2ei3ee"
-    
-    hsh = {"foo" => "bar", "baz" => "qux"}
-    should_decode hsh, "d3:foo3:bar3:baz3:quxe"
-    
-    should_decode 42, "i42eBOGUS", :ignore_trailing_junk => true
-  end
+  it_should_decode [1, 2, 3], "li1ei2ei3ee"
+  
+  hsh = {"foo" => "bar", "baz" => "qux"}
+  it_should_decode hsh, "d3:foo3:bar3:baz3:quxe"
+  
+  it_should_decode 42, "i42eBOGUS", :ignore_trailing_junk => true
 end

test/encoding_test.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 require 'environment'
 
-class EncodingTest < MiniTest::Unit::TestCase
-  context "The BEncode encoder" do
-    should_encode "i42e", 42
-    should_encode "3:foo", "foo"
-    should_encode "5:café", "café"
-  end
+describe "encoding" do
+  it_should_encode "i42e", 42
+  it_should_encode "3:foo", "foo"
+  it_should_encode "5:café", "café"
 end

test/environment.rb

@@ -1,11 +1,9 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'minitest/unit'
+require 'minitest/autorun'
 require 'shoulda'
 
-MiniTest::Unit.autorun
-
 require File.dirname(__FILE__) + '/../lib/bencode'
 Dir.glob(File.dirname(__FILE__) + '/shoulda_macros/*.rb').each do |macro|
   require macro

test/shoulda_macros/decoding.rb

@@ -1,7 +1,7 @@
 
-class MiniTest::Unit::TestCase
-  def self.should_decode(expected, encoded, opts = {})
-    should "decode #{encoded.inspect} into #{expected.inspect}" do
+class MiniTest::Test
+  def self.it_should_decode(expected, encoded, opts = {})
+    it "should decode #{encoded.inspect} into #{expected.inspect}" do
       assert_equal expected, BEncode.load(encoded, opts)
     end
   end

test/shoulda_macros/encoding.rb

@@ -1,7 +1,7 @@
 
-class MiniTest::Unit::TestCase
-  def self.should_encode(expected, value)
-    should "encode #{value.inspect} into #{expected.inspect}" do
+class MiniTest::Test
+  def self.it_should_encode(expected, value)
+    it "should encode #{value.inspect} into #{expected.inspect}" do
       assert_equal expected, value.bencode
     end
   end

test/utf8_decoding_test.rb

@@ -1,10 +1,8 @@
 require 'environment'
 
-class UTF8DecodingTest < MiniTest::Unit::TestCase
-  context "The BEncode decoder" do
-    should "be able to handle UTF8-encoded data" do
-      BEncode.load_file('test/fixtures/test.torrent')
-      pass
-    end
+describe "utf encoding" do
+  it "should be able to handle UTF8-encoded data" do
+    BEncode.load_file('test/fixtures/test.torrent')
+    pass
   end
 end