Merge branch 'develop'

This commit is contained in:
Mark Moser 2017-05-10 17:06:52 -05:00
commit ede4b8cb94
3 changed files with 3 additions and 2 deletions

View File

@ -26,7 +26,7 @@ class ReviewerReminder
from reviewer_votes rev from reviewer_votes rev
inner join users u on u.id = rev.user_id inner join users u on u.id = rev.user_id
inner join candidates c on c.id = rev.candidate_id inner join candidates c on c.id = rev.candidate_id
where rev.vote = 0 and rev.veto = 0 where rev.vote = 0 and c.review_status = 0
and u.role != 'manager' and u.active is not false;" and u.role != 'manager' and u.active is not false;"
ActiveRecord::Base.connection.exec_query(sql) ActiveRecord::Base.connection.exec_query(sql)
end end

View File

@ -137,6 +137,7 @@ wade: # Wade has completed AND submitted the test
completed_at: <%= DateTime.current - 8.days %> completed_at: <%= DateTime.current - 8.days %>
reminded: false reminded: false
test_hash: BkSkpapJnkz2N test_hash: BkSkpapJnkz2N
review_status: 2
jorge: # Jorge has completed AND submitted the test jorge: # Jorge has completed AND submitted the test
name: Jorge Holmes name: Jorge Holmes

View File

@ -4,7 +4,7 @@ require 'test_helper'
class ReviewerReminderTest < ActiveSupport::TestCase class ReviewerReminderTest < ActiveSupport::TestCase
test "collection is created with results" do test "collection is created with results" do
reminders = ReviewerReminder.new reminders = ReviewerReminder.new
assert_equal 8, reminders.size assert_equal 7, reminders.size
end end
test "each reminder has needed attributes" do test "each reminder has needed attributes" do