Stevie Spiegl RPS

app.rb

@@ -14,29 +14,17 @@ class RockPaperScissors < Sinatra::Base
     erb :form
   end
 
-  post '/name' do
-    p params
+  post '/play' do
     session[:player] = params[:player]
     $player = Player.new(params[:player])
-    redirect '/play'
-  end
-
-  post '/name_play_again' do
-    p params
-    session[:player] = params[:player]
-    $player = Player.new(params[:player])
-    redirect '/play_again'
-  end
-
-  get '/play' do
     @player_name = $player.name
-    #tried to get the welcome message into name... but no luck
     erb :play
   end
 
-  get '/play_again' do
+  post '/play_again' do
+    session[:player] = params[:player]
+    $player = Player.new(params[:player])
     @player_name = $player.name
-    #tried to get the welcome message into name... but no luck
     erb :play_again
   end
 
@@ -49,10 +37,6 @@ class RockPaperScissors < Sinatra::Base
     erb :battle
   end
 
-  # run the model in the controller. Take args such as computer (contained in model)
-  # player choice (a param), and use them with the if/else statement in the engine
-  # to return a winner which can be interpolated in the view
-
 # Start the server if this file is executed directly (don't change the line below)
   run! if app_file == $0
 end

lib/game.rb

@@ -28,9 +28,4 @@ def engine
       "You did not choose wisely."
     end
   end
-
-  #replace the strings with a method, either winning_message or losing_message
-  #each will run sample on an array of three messages
-  #or use the phrases to suggest another go
-
 end

spec/features/enter_names_spec.rb

@@ -11,12 +11,12 @@
   end
 
   scenario 'player is taken to a new page to start the game' do
-    sign_in_and_play
+    sign_in
     expect(current_path).to eq('/play')
   end
 
   scenario 'player can see their name on the play page' do
-    sign_in_and_play
+    sign_in
     expect(current_path).to eq('/play')
     expect(page).to have_content('Alien')
   end

spec/features/play_game_spec.rb

@@ -5,66 +5,43 @@
 
 feature 'allows player to play a game of RockPaperScissors' do
   scenario 'the player can choose from three buttons' do
-    sign_in_and_play
+    sign_in
     expect(page).to have_xpath('/html/body/form[1]/input[1]')
     expect(page).to have_xpath('/html/body/form[2]/input[1]')
     expect(page).to have_xpath('/html/body/div/form/input[1]')
   end
-  #the above is a workaround because I can't seem to check for a link
-  #in the same way I was able to check for a button before I turned them
-  #into images... not sure how good it is though because you need to know
-  #the xpath before writing the tests...
 
   scenario 'a player can return to the play screen to have another go' do
-    sign_in_and_play
+    sign_in
     click_on(id='rock')
     expect(page).to have_button('Have another go?')
   end
 
 
   scenario 'clicking a button takes the player to the winner page' do
-    sign_in_and_play
+    sign_in
     click_on(id='rock')
     expect(current_path).to eq '/battle'
   end
 
   scenario 'rock beats scissors' do
     allow_any_instance_of(Computer).to receive(:weapon).and_return(:scissors)
-    sign_in_and_play
+    sign_in
     click_on(id='rock')
     expect(page).to have_content "You chose wisely."
   end
 
   scenario 'paper beats rock' do
     allow_any_instance_of(Computer).to receive(:weapon).and_return(:paper)
-    sign_in_and_play
+    sign_in
     click_on(id='rock')
     expect(page).to have_content "You did not choose wisely."
   end
 
   scenario 'scissors beats paper' do
     allow_any_instance_of(Computer).to receive(:weapon).and_return(:paper)
-    sign_in_and_play
+    sign_in
     click_on(id='scissors')
     expect(page).to have_content "You chose wisely."
   end
-
-#why no need for srand here in the stubs above?
-#what's the difference between stubbing here and the doubling
-#in the tests for computer_spec???
-
-#would these tests be better off in the model???
-
-
-
-  #functionality to add:
-
-
-
-  #I'd like to route to a different image depending on the result
-  #but that seems like too much for now...
-  #credit unsplash photographers
-
-
-
 end

spec/features/web_helpers.rb

@@ -1,4 +1,4 @@
-def sign_in_and_play
+def sign_in
   visit('/')
   fill_in 'player', with: 'Alien'
   click_on('Submit name!')

spec/game_spec.rb

@@ -1,16 +1,4 @@
 require 'game'
 
 describe Game do
-  xit 'paper beats scissors' do
-  end
-  xit 'scissors beats rock' do
-  end
-  xit 'rock beats scissors' do
-  end
-  xit 'two of the same draw' do
-  end
-  xit 'displays a congratulatory message if the player wins' do
-  end
-  xit 'taunts the player if they lose' do
-  end
 end

spec/player_spec.rb

@@ -5,7 +5,4 @@
   it "should return player's name" do
     expect(player.name).to eq('Clodius')
   end
-
-  xit 'allows a player to choose a weapon' do
-  end
 end

views/battle.erb

@@ -16,7 +16,7 @@ text-align: center;}
 <h1>You chose <%= @player_weapon %>...<br></h1>
 <h1>Computer chose <%= @computer_weapon %>...<br><h1>
 <h1><%= @message %><h1>
-<form action='/name_play_again' method='post'>
+<form action='/play_again' method='post'>
   <button type="submit" style="padding: 5px 10px">Have another go?</button>
 </form>
 </body>

views/form.erb

@@ -9,7 +9,7 @@ h1 {text-align: center; font-family: arial; padding-top: 20px}
 </style>
 
 <h1>Enter Name</h1>
-<form action='/name' method='post'>
+<form action='/play' method='post'>
   <input type="text" name="player" style="padding: 5px 15px"><br><br>
   <button type="submit" style="padding: 5px 10px">Submit name!</button>
   </form>

views/play.erb

@@ -23,7 +23,6 @@ border='2' name='player_choice' type='submit' id='paper'></>
   <input type="hidden" name="player_choice" value="paper" />
   </form>
 <div style="margin: 0px auto; width: 400; height: 267; overflow: hidden; border: 2px solid black">
-  <!-- margin: 0px auto saved me here, nothing else would center the div -->
   <form action='/battle' method='post'>
 <input type='image' src='https://source.unsplash.com/c18q3myyHLU' width='400'
 name='player_choice' type='submit' id='scissors'></>