Merge branch 'fix_tests_for_2.1'

Gemfile

@@ -2,3 +2,5 @@ source "https://rubygems.org"
 gem "colored"
 gem "mocha"
 gem "parallel"
+gem "minitest"
+gem "rake"

Gemfile.lock

@@ -2,15 +2,19 @@ GEM
   remote: https://rubygems.org/
   specs:
     colored (1.2)
-    metaclass (0.0.1)
-    mocha (0.10.0)
+    metaclass (0.0.2)
+    minitest (5.2.2)
+    mocha (1.0.0)
       metaclass (~> 0.0.1)
-    parallel (0.5.9)
+    parallel (0.9.2)
+    rake (10.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   colored
+  minitest
   mocha
   parallel
+  rake

lib/battleship/board.rb

@@ -1,6 +1,6 @@
 module Battleship
   class Board
-    
+
     def initialize(size, expected_fleet, positions)
       @size = size
       @expected_fleet = expected_fleet
@@ -72,11 +72,12 @@ def valid_fleet?(fleet)
     def expand_positions(positions)
       return [] unless positions.is_a?(Enumerable)
       positions.map{ |p| expand_position(*p) }
-    rescue ArgumentError
+    rescue ArgumentError, NoMethodError
       []
     end
 
     def expand_position(x, y, length, direction)
+      raise ArgumentError unless [:across, :down].include?(direction)
       dx, dy = direction == :across ? [1, 0] : [0, 1]
       (0 ... length).map{ |i| [x + i * dx, y + i * dy] }
     end

test/console_renderer_test.rb

@@ -1,7 +1,7 @@
 require "minitest/autorun"
 require "battleship/console_renderer"
 require "stringio"
-require "mocha"
+require "mocha/mini_test"
 
 class ConsoleRendererTest < MiniTest::Unit::TestCase
   include Battleship