Use a dedicated page for joining game

Author: cveneziani

app/controllers/games_controller.rb

@@ -16,15 +16,12 @@ def create
 
   def join_game
     return if @game.state == 'finished'
-    enlist = Players::Enlist.new(game: @game, player: current_player)
+    enlist  = Players::Enlist.new(game: @game, player: current_player)
 
     if enlist.game_full?
       return render FullGame.template_path
-    else # try to enter the game
-      payload = enlist.assign_game_to_player!
-      set_current_player(enlist.player)
-
-      ActionCable.server.broadcast "game_#{current_player.game_id}", payload
+    else
+      return render AwaitingOpponentGame.template_path
     end
   end
 

app/controllers/opponent_controller.rb

@@ -0,0 +1,22 @@
+class OpponentController < ApplicationController
+  before_action :set_game,  only: [:create]
+
+  def create
+    enlist = Players::Enlist.new(game: @game, player: current_player)
+    return redirect_to game_path(@game) if enlist.game_full?
+
+    payload = enlist.assign_game_to_player!
+    set_current_player(enlist.player)
+    ActionCable.server.broadcast "game_#{current_player.game_id}", payload
+
+    redirect_to game_path(@game)
+  end
+
+  private
+
+  def set_game
+    @game = Game.find_by(slug: params[:game_id].parameterize)
+    return redirect_to root_path        unless @game
+    return redirect_to game_path(@game) if @game.state != 'awaiting_opponent'
+  end
+end

app/models/awaiting_opponent_game.rb

@@ -0,0 +1,5 @@
+class AwaitingOpponentGame < Game
+  def self.template_path
+    "games/awaiting_opponent"
+  end
+end

app/views/games/awaiting_opponent.html.erb

@@ -0,0 +1,20 @@
+<div class="row">
+  <%= render "games/stars" %>
+  <div class="wrapper">
+    <div class="join_us">
+      <div class="mothership">
+        <div class="ship">
+          <%= render "games/ships/svg/mothership" %>
+        </div>
+      </div>
+    </div>
+    <div class="too_late">
+      <h1>You've been challenged to a battle!</h1>
+      <p>Your opponent is waiting for you. Join the room <strong><%= @game.name %></strong> right now!</p>
+
+      <%= form_tag game_opponent_path(@game), method: :post do %>
+        <%= submit_tag "Join Game", class: "button green" %>
+      <% end %>
+    </div>
+  </div>
+</div>

config/routes.rb

@@ -6,7 +6,11 @@
   resources :attacks,   only: [:create]
   resources :bombings,  only: [:create]
   resources :defenses,  only: [:create]
-  resources :games,     only: [:show, :create]
+
+  resources :games,     only: [:show, :create] do
+    resource :opponent, only: [:create], controller: 'opponent'
+  end
+
   resources :players,   only: [:update]
 
   #Lets's encrypt

spec/requests/games_spec.rb

@@ -49,43 +49,38 @@
           get "/games/#{other_game.to_param}"
         end
 
-        it { expect(Player.count).to eq(2) }
-        it { expect(Player.last.id).not_to eq(player.id) }
-        it { expect(Player.last.nickname).to eq("Rico") }
-        it { expect(Player.last.life).to eq(10) }
         it { expect(response).to have_http_status(200) }
-        it { expect(response.body).to_not include("already full") }
+        it { expect(response.body).to include("Join Game") }
+
+        it { expect(Player.last.id).to eq(player.id) }
+        it { expect(Player.last.nickname).to eq("Rico") }
+
+        it 'does not create a new player' do
+          expect(Player.count).to eq(1)
+        end
+
+        it "does not update player's life" do
+          expect(Player.last.life).to eq(3)
+        end
+
+        it 'does not change game of current player' do
+          expect(Player.last.game).to eq(game)
+        end
       end
     end
 
     context "player is not signed in" do
       context "game is not full" do
         before :each do
           game.update(state: 'awaiting_opponent')
-          allow(ActionCable.server).to receive(:broadcast)
           get "/games/#{game.to_param}"
         end
 
         it { expect(response).to have_http_status(200) }
-        it { expect(Player.count).to eq(1) }
         it { expect(response.body).to include(game.name) }
-        it { expect(Player.last.game).to eq(game) }
-        it { expect(Player.last.life).to eq(10) }
-
-        it 'sets game state to running' do
-          expect(game.reload.state).to eq('running')
-        end
-
-        it 'broadcasts a player joined payload' do
-          expect(ActionCable.server).to have_received(:broadcast).with(
-            anything,
-            {
-              code:       'player_joined',
-              player_id:  Player.last.id,
-              nickname:   Player.last.nickname
-            }
-          )
-        end
+        it { expect(response.body).to include("Join Game") }
+        it { expect(Player.count).to eq(0) }
+        it { expect(game.reload.state).to eq('awaiting_opponent') }
       end
 
       context "game is already full" do

spec/requests/opponent_spec.rb

@@ -0,0 +1,80 @@
+require "rails_helper"
+
+RSpec.describe "Opponent", type: :request do
+  describe 'POST create' do
+    let(:game) { Game.create!(name: 'Starship Battle', slug: 'starship-battle', state: 'awaiting_opponent') }
+
+    before :each do
+      game.players.create!
+    end
+
+    context 'when game is not full' do
+      before :each do
+        allow(ActionCable.server).to receive(:broadcast)
+        post "/games/starship-battle/opponent"
+      end
+
+      it { expect(response).to redirect_to("/games/starship-battle") }
+      it { expect(Player.count).to eq(2) }
+      it { expect(Player.last.game).to eq(game) }
+      it { expect(Player.last.life).to eq(10) }
+
+      it 'sets game state to running' do
+        expect(game.reload.state).to eq('running')
+      end
+
+      it 'broadcasts a player joined payload' do
+        expect(ActionCable.server).to have_received(:broadcast).with(
+          anything,
+          {
+            code:       'player_joined',
+            player_id:  Player.last.id,
+            nickname:   Player.last.nickname
+          }
+        )
+      end
+    end
+
+    context 'when game is full' do
+      before :each do
+        game.update(state: 'running')
+        game.players.create!
+        post "/games/starship-battle/opponent"
+      end
+
+      it { expect(response).to redirect_to("/games/starship-battle") }
+      it { expect(Player.count).to eq(2) }
+      it { expect(Game.last.state).to eq('running') }
+
+      it 'tells game is full' do
+        follow_redirect!
+        expect(response.body).to include('already full')
+      end
+    end
+
+    context 'when game is already finished' do
+      before :each do
+        game.update(state: 'finished')
+        post "/games/starship-battle/opponent"
+      end
+
+      it { expect(response).to redirect_to("/games/starship-battle") }
+      it { expect(Player.count).to eq(1) }
+      it { expect(Game.last.state).to eq('finished') }
+
+      it 'tells game is finished' do
+        follow_redirect!
+        expect(response.body).to include('Game Finished')
+      end
+    end
+
+    context "game doesn't exist" do
+      before :each do
+        post "/games/foo/opponent"
+      end
+
+      it { expect(response).to redirect_to(root_path) }
+      it { expect(Player.count).to eq(1) }
+    end
+  end
+end