do not show prev deltas without teams

severest · May 22, 2018 · fc09a60 · fc09a60
1 parent 03125a5
commit fc09a60
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/app/controllers/retro_controller.rb b/app/controllers/retro_controller.rb
@@ -3,6 +3,7 @@ def show
     @retro = Retro.find_by_key!(params[:key])
     @prev_retro_deltas = []
     prev_retro = Retro.where(team: @retro.team)
+                      .where.not(team: nil)
                       .where(status: :locked)
                       .where.not(id: @retro.id)
                       .order('created_at desc').first()

diff --git a/test/controllers/retro_controller_test.rb b/test/controllers/retro_controller_test.rb
@@ -73,4 +73,13 @@ class RetroControllerTest < ActionDispatch::IntegrationTest
     json_response = JSON.parse(@response.body)
     assert_equal 0, json_response['prev_deltas'].count
   end
+
+  test "should not have prev deltas on retro with no team" do
+    old_retro = create(:full_retro, key: 'eeeee1', status: 'locked')
+    retro = create(:retro, key: 'eeeee2')
+    get "/api/retro/#{retro.key}"
+    assert_response :success
+    json_response = JSON.parse(@response.body)
+    assert_equal 0, json_response['prev_deltas'].count
+  end
 end