Skip to content

Commit c58ce74

Browse files
committed
Removed #setup_player method
1 parent 8a86b19 commit c58ce74

File tree

4 files changed

+9
-20
lines changed

4 files changed

+9
-20
lines changed

lib/tic_tac_toe/game.rb

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,11 @@ class Game
55

66
def initialize(board=nil, player_settings, current_player_mark)
77
@board = board ||= Board.new
8-
@player1 = set_player(0, player_settings)
9-
@player2 = set_player(1, player_settings)
8+
@player1 = Player.new(player_settings[0])
9+
@player2 = Player.new(player_settings[1])
1010
@current_player_mark = current_player_mark
1111
end
1212

13-
def set_player(index, player_settings)
14-
mark = player_settings[index][:mark]
15-
Player.new(mark)
16-
end
17-
1813
def board_to_array
1914
board.to_array
2015
end
@@ -52,6 +47,5 @@ def get_winning_player
5247
def tie?
5348
board.tie_game?
5449
end
55-
5650
end
5751
end

spec/ai_spec.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,16 @@ module TicTacToe
77
it "selects the winning move when able to win" do
88
cells = ['O', 'O', nil, 'X', 'X', nil, nil, nil, nil]
99
board = Board.new(size: 3, cells: cells)
10-
ai = AI.new(Player.new('O'))
10+
ai = AI.new('O')
1111
expect(ai.get_move(board)).to eq 2
1212
end
1313

1414
it "blocks winning move when opponent is able to win" do
1515
cells = ['X', 'X', nil, nil, 'O', nil, nil, nil, nil]
1616
board = Board.new(size: 3, cells: cells)
17-
ai = AI.new(Player.new('O'))
17+
ai = AI.new('O')
1818
expect(ai.get_move(board)).to eq 2
1919
end
2020
end
21-
22-
2321
end
2422
end

spec/game_spec.rb

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,31 @@
22

33
module TicTacToe
44
describe Game do
5-
let(:player_settings1) {[{mark: 'X', ai: false}, {mark: 'O', ai: true}]}
6-
let(:player_settings2) {[{mark: 'X', ai: true}, {mark: 'O', ai: false}]}
7-
let(:player_settings3) {[{mark: 'X', ai: false}, {mark: 'O', ai: false}]}
8-
let(:game) {Game.new(player_settings1, 'X')}
9-
5+
let(:player_settings) {['X', 'O']}
6+
let(:game) {Game.new(player_settings, player_settings[0])}
107

118
let(:game_in_play) do
129
cells = ['O', 'O', nil,
1310
nil, 'X', nil,
1411
nil, nil, nil]
1512
board = Board.new(cells: cells)
16-
Game.new(board, player_settings3, 'X')
13+
Game.new(board, player_settings, 'X')
1714
end
1815

1916
let(:won_game) do
2017
cells = ['X', 'X', 'O',
2118
'O', 'X', 'X',
2219
'X', 'O', 'X']
2320
board = Board.new(cells: cells)
24-
Game.new(board, player_settings3, 'X')
21+
Game.new(board, player_settings, 'X')
2522
end
2623

2724
let(:tie_game) do
2825
cells = ['X', 'X', 'O',
2926
'O', 'O', 'X',
3027
'X', 'O', 'X']
3128
board = Board.new(cells: cells)
32-
Game.new(board, player_settings3, 'X')
29+
Game.new(board, player_settings, 'X')
3330
end
3431

3532
describe "#take_turn" do

tic_tac_toe-0.0.1.gem

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)