Added #check_for_computer_turn method

lib/game_helpers.rb

@@ -16,14 +16,20 @@ def opponent_mark(mark)
     mark == "X" ? "O" : "X"
   end
 
-  def computer_opponent(params)
+  def computer_opponent(params, game)
     player_order = params[:player_order]
     if params[:computer_opponent] == "yes"
-      return player_order == "first" ? "player2" : "player1"
+      return player_order == "first" ? game.player2 : game.player1
     end
     nil
   end
 
+  def check_for_computer_turn(game)
+    if game.current_player_mark == session[:computer_opponent]
+      game.take_turn(game.generate_ai_move)
+    end
+  end
+
   def array_to_board(array)
     TicTacToe::Board.new(cells: array)
   end

tic_tac_toe_controller.rb

@@ -23,11 +23,10 @@ class TicTacToeController < Sinatra::Base
     else
       game = create_game(params)
 
-      if computer_opponent(params) == "player1"
-        game.take_turn(game.generate_ai_move)
-      end
+      session[:computer_opponent] = computer_opponent(params, game)
+
+      check_for_computer_turn(game)
 
-      session[:computer_opponent] = computer_opponent(params)
       session[:player1_mark] = player_marks(params)[0]
       session[:player2_mark] = player_marks(params)[1]
       session[:current_player_mark] = game.current_player_mark
@@ -53,9 +52,7 @@ class TicTacToeController < Sinatra::Base
       redirect to('/game_over')
     end
 
-    if session[:computer_opponent] != nil
-      game.take_turn(game.generate_ai_move)
-    end
+    check_for_computer_turn(game)
 
     session[:moves] = game.board_to_array
     session[:current_player_mark] = game.current_player_mark