Ongoing implementation of the minefield_initializer.

svarlet · May 27, 2015 · 241e0a1 · 241e0a1
1 parent 5d434cb
commit 241e0a1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/lib/minesweeper/console/minefield_initializer.rb b/lib/minesweeper/console/minefield_initializer.rb
@@ -18,7 +18,17 @@ def generate(quantity_of_mines)
         end
 
         mines = []
-        quantity_of_mines.times { mines << [rand(@minefield.size), rand(@minefield.size)] }
+        quantity_of_mines.times do
+          loop do
+            a_mine = [rand(@minefield.size), rand(@minefield.size)]
+            if mines.include?(a_mine)
+              next
+            else
+              mines << a_mine
+              break
+            end
+          end
+        end
         mines
       end
     end

diff --git a/test/minesweeper/console/minefield_initializer_test.rb b/test/minesweeper/console/minefield_initializer_test.rb
@@ -47,13 +47,7 @@ def test_each_mine_has_unique_coordinates
         assert_true(mines & mines == mines)
       end
 
-      def test_when_generate_is_executed_twice_then_both_results_dont_match
-        a_minefield = Minesweeper::Minefield.new(2)
-        sut = MinefieldInitializer.new(a_minefield)
-        some_mines = sut.generate(2)
-        other_mines = sut.generate(2)
-        assert_not_equal(some_mines, other_mines)
-      end
+
     end
   end
 end