Catching up with master

Author: r3trofitted

app/models/attack.rb

@@ -31,7 +31,7 @@ def initialize(game:, word:, player:)
   private
 
   def game_running?
-    unless game.state == 'running'
+    unless game.running?
       errors.add(:game, "not_running")
     end
   end

spec/models/attack_spec.rb

@@ -2,11 +2,14 @@
 
 RSpec.describe "Attack", type: :model do
   subject(:attack)  { Attack.new(game: game, word: word, player: player) }
-  let(:game)        { Game.create!(state: 'running') }
+  let(:game)        { Game.create! }
   let(:word)        { 'attack' }
   let(:player)      { Player.new }
 
-  before { allow_words("attack") }
+  before do
+    allow_words("attack")
+    game.running!
+  end
 
   describe '.reward_for' do
     describe 'word between 0 and 1 letters' do
@@ -102,7 +105,7 @@
     context 'when game is finished' do
       before :each do
         allow_words("finished")
-        game.update(state: 'finished')
+        game.finished!
       end
 
       it 'returns false' do

spec/requests/attacks_spec.rb

@@ -1,10 +1,11 @@
 require "rails_helper"
 
 RSpec.describe "Attacks", type: :request do
-  let(:game)            { Game.create!(name: 'Starship Battle', state: 'running') }
+  let(:game)            { Game.create!(name: 'Starship Battle') }
   let(:player)          { game.players.create!(nickname: "Rico") }
 
   before :each do
+    game.running!
     allow_any_instance_of(ApplicationController).to receive(:current_player).and_return(player)
   end