Refactored GameSetup class

lib/game_setup.rb

@@ -18,20 +18,8 @@ def invalid?
   private
 
   def run_validations
-    validate_player
-    validate_opponent
-    validate_player_order
-  end
-
-  def validate_player_mark
     validate(:player_mark)
-  end
-
-  def validate_opponent
     validate(:opponent)
-  end
-
-  def validate_player_order
     validate(:player_order)
   end
 

spec/game_setup_spec.rb

@@ -13,6 +13,10 @@
       expect(valid_game_setup.valid?).to eq true
     end
 
+    it 'checks if game configurations are invalid' do
+      expect(valid_game_setup.invalid?).to eq false
+    end
+
     it 'does not produce error messages' do
       expect(valid_game_setup.errors.empty?).to eq true
     end
@@ -23,7 +27,12 @@
       expect(invalid_game_setup.valid?).to eq false
     end
 
-    it 'does not produce error messages' do
+    it 'checks if game configurations are invalid' do
+      expect(invalid_game_setup.invalid?).to eq true
+    end
+
+    it 'retrieves and stores the appropriate error messages for invalid params' do
+      invalid_game_setup.valid?
       expect(invalid_game_setup.errors.empty?).to eq false
     end
   end

spec/tic_tac_toe_controller_spec.rb

@@ -1,7 +1,7 @@
 ENV['RACK_ENV'] = 'test'
 
 
-require 'tic_tac_toe_controller'
+require '../tic_tac_toe_controller'
 require 'rspec'
 require 'rack/test'
 

tic_tac_toe_controller.rb

@@ -3,7 +3,6 @@
 require './lib/game_setup'
 
 class TicTacToeController < Sinatra::Base
-  include Validation
   enable :sessions
 
   get '/' do