Merge branch 'development'

Author: rsierra

app/models/game.rb

@@ -65,7 +65,7 @@ class Game < ActiveRecord::Base
   scope :on_league, ->(league_id) { where(league_id: league_id) }
   scope :playing, ->(time = Time.now) { where(date: (time - TIME_AFTER)..(time + TIME_BEFORE))}
   scope :last_week, joins("INNER JOIN leagues ON leagues.id = games.league_id AND leagues.season = games.season AND leagues.week - 1 = games.week")
-  scope :nexr_week, joins("INNER JOIN leagues ON leagues.id = games.league_id AND leagues.season = games.season AND leagues.week + 1 = games.week")
+  scope :next_week, joins("INNER JOIN leagues ON leagues.id = games.league_id AND leagues.season = games.season AND leagues.week + 1 = games.week")
   scope :current_week, joins("INNER JOIN leagues ON leagues.id = games.league_id AND leagues.season = games.season AND leagues.week = games.week")
   scope :played, ->(time = Time.now) {
         current_week

app/models/player.rb

@@ -87,7 +87,7 @@ def season_average_stats(stat,league, season=league.season)
   end
 
   def played_on_league? league, time = Time.now
-    file.club.played_on_league? league, time
+    file.club.played_on_league?(league, time) if file
   end
 
   def last_game_on_league league

app/views/shared/_player_games.html.erb

@@ -4,7 +4,7 @@
     <% last_game = player_games.last_game_on_league(@current_league) %>
     <% if last_game %>
     <%= last_game.is_visible? ? link_to(last_game.name, game_path(last_game)) : last_game.name %>
-    (<%= player_games.week_stats(:points, @current_league, @current_league.season, @current_league.current_week) %>
+    (<%= player_games.week_stats(:points, last_game.league, last_game.season, last_game.week) %>
     <%= PlayerStat.human_attribute_name(:points) %>)
     <% end %>
   </dd>

spec/models/player_spec.rb

@@ -285,7 +285,7 @@
     end
   end
 
-  describe "when player played" do
+  describe "when player played on league" do
     let(:date_time) { DateTime.now }
     let(:league) { create(:league) }
     let(:club) { create(:club, leagues: [league]) }
@@ -294,17 +294,17 @@
     before { player }
     subject { player }
 
-    its(:played?) { should be_true }
-    it { player.played?(date_time - Game::TIME_BEFORE - 1.hour).should be_false }
-    it { player.played?(date_time - Game::TIME_BEFORE).should be_true }
-    it { player.played?(date_time).should be_true }
-    it { player.played?(date_time + Game::TIME_AFTER).should be_true }
-    it { player.played?(date_time + Game::TIME_AFTER + 1.hour).should be_true }
+    it { player.played_on_league?(league).should be_true }
+    it { player.played_on_league?(league, date_time - Game::TIME_BEFORE - 1.hour).should be_false }
+    it { player.played_on_league?(league, date_time - Game::TIME_BEFORE).should be_true }
+    it { player.played_on_league?(league, date_time).should be_true }
+    it { player.played_on_league?(league, date_time + Game::TIME_AFTER).should be_true }
+    it { player.played_on_league?(league, date_time + Game::TIME_AFTER + 1.hour).should be_true }
 
     context "in next week" do
       before { league.update_attributes(week: league.week + 1) }
 
-      its(:played?) { should be_false }
+      it { player.played_on_league?(league).should be_false }
     end
   end
 end

spec/models/team_file_spec.rb

@@ -153,13 +153,13 @@
       it { team_file.error_on(:team).should include I18n.t(cant_have_more_no_eu_error_translation_key) }
     end
 
-    context "with played player" do
+    context "with player played on league" do
       let(:cant_be_played_error_translation_key) { "#{error_translation_key}.player.cant_be_played" }
 
       let(:player) { create(:player) }
       let(:team_file) { build(:team_file, player: player) }
 
-      before { team_file; player.stub(:played?).and_return(true) }
+      before { team_file; player.stub(:played_on_league?).and_return(true) }
       subject { team_file }
 
       it { should_not be_valid }
@@ -183,15 +183,15 @@
   end
 
   describe "when destroy" do
-    context "with played player" do
+    context "with player played on league" do
       let(:cant_be_played_error_translation_key) { "#{error_translation_key}.player.cant_be_played" }
 
       let(:player) { create(:player) }
       let(:team_file) { build(:team_file, player: player) }
 
       before do
         team_file
-        player.stub(:played?).and_return(true)
+        player.stub(:played_on_league?).and_return(true)
         team_file.destroy
       end