From e456820031062bc3a8084e31fe1619d495a55ff7 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Mon, 1 Feb 2021 17:22:38 -0600 Subject: [PATCH] bring back rspec --- admin/log/phantomjs.out | 0 ruby/lib/jam_ruby/models/active_music_session.rb | 4 ++-- ruby/lib/jam_ruby/models/band_search.rb | 13 +++++++------ ruby/lib/jam_ruby/models/musician_search.rb | 12 ++++++------ ruby/lib/jam_ruby/models/search.rb | 10 +++++----- ruby/spec/jam_ruby/flows/normal_lesson_spec.rb | 2 ++ ruby/spec/jam_ruby/flows/recurring_lesson_spec.rb | 2 ++ ruby/spec/jam_ruby/flows/testdrive_lesson_spec.rb | 4 ++++ ruby/spec/jam_ruby/models/geo_ip_blocks_spec.rb | 2 ++ ruby/spec/jam_ruby/models/get_work_spec.rb | 4 +++- ruby/spec/jam_ruby/models/jam_isp_spec.rb | 3 +++ .../jam_ruby/models/lesson_booking_slot_spec.rb | 2 ++ ruby/spec/jam_ruby/models/lesson_booking_spec.rb | 4 ++++ .../jam_ruby/models/lesson_session_analyser_spec.rb | 4 ++++ ruby/spec/jam_ruby/models/lesson_session_spec.rb | 2 ++ ruby/spec/jam_ruby/models/score_history_spec.rb | 2 ++ ruby/spec/jam_ruby/models/teacher_payment_spec.rb | 2 ++ ruby/spec/mailers/render_emails_spec.rb | 2 ++ ruby/spec/mailers/teacher_lesson_email_spec.rb | 4 ++++ ruby/spec/support/maxmind.rb | 6 ++++-- web/spec/features/lesson_booking_status_spec.rb | 5 ++++- 21 files changed, 66 insertions(+), 23 deletions(-) delete mode 100644 admin/log/phantomjs.out diff --git a/admin/log/phantomjs.out b/admin/log/phantomjs.out deleted file mode 100644 index e69de29bb..000000000 diff --git a/ruby/lib/jam_ruby/models/active_music_session.rb b/ruby/lib/jam_ruby/models/active_music_session.rb index a85745632..dd695cd19 100644 --- a/ruby/lib/jam_ruby/models/active_music_session.rb +++ b/ruby/lib/jam_ruby/models/active_music_session.rb @@ -199,7 +199,7 @@ module JamRuby } ) - query = Search.scope_schools_together_sessions(query, user) + query = Search.scope_schools_together_sessions(query, current_user) if as_musician query = query.where( @@ -419,7 +419,7 @@ module JamRuby } ) - query = Search.scope_schools_together_sessions(query, user) + query = Search.scope_schools_together_sessions(query, current_user) query = query.offset(offset) if offset query = query.limit(limit) if limit diff --git a/ruby/lib/jam_ruby/models/band_search.rb b/ruby/lib/jam_ruby/models/band_search.rb index c03ae2507..ff01a7dc4 100644 --- a/ruby/lib/jam_ruby/models/band_search.rb +++ b/ruby/lib/jam_ruby/models/band_search.rb @@ -219,12 +219,13 @@ module JamRuby def _sort_order(rel, filter) val = filter[KEY_SORT_ORDER] if 'distance' == val || val.blank? - locidispid = self.user.last_jam_locidispid || 0 - my_locid = locidispid / 1000000 - rel = rel.joins("LEFT JOIN geoiplocations AS my_geo ON my_geo.locid = #{my_locid}") - rel = rel.joins("LEFT JOIN geoiplocations AS other_geo ON other_geo.latitude = bands.lat AND other_geo.longitude = bands.lng") - rel = rel.group("bands.id, my_geo.geog, other_geo.geog") - rel = rel.order('st_distance(my_geo.geog, other_geo.geog)') + # TODO: bring back search by distance + #locidispid = self.user.last_jam_locidispid || 0 + #my_locid = locidispid / 1000000 + #rel = rel.joins("LEFT JOIN geoiplocations AS my_geo ON my_geo.locid = #{my_locid}") + #rel = rel.joins("LEFT JOIN geoiplocations AS other_geo ON other_geo.latitude = bands.lat AND other_geo.longitude = bands.lng") + #rel = rel.group("bands.id") + #rel = rel.order('st_distance(my_geo.geog, other_geo.geog)') elsif 'price_asc' == val rel = rel.order('gig_minimum ASC') diff --git a/ruby/lib/jam_ruby/models/musician_search.rb b/ruby/lib/jam_ruby/models/musician_search.rb index 1071f95a5..81639cd1c 100644 --- a/ruby/lib/jam_ruby/models/musician_search.rb +++ b/ruby/lib/jam_ruby/models/musician_search.rb @@ -130,12 +130,12 @@ module JamRuby def _sort_order(rel) val = json[self.class::KEY_SORT_ORDER] if self.class::SORT_VALS[1] == val - locidispid = self.user.last_jam_locidispid || 0 - my_locid = locidispid / 1000000 - rel = rel.joins("LEFT JOIN geoiplocations AS my_geo ON my_geo.locid = #{my_locid}") - rel = rel.joins("LEFT JOIN geoiplocations AS other_geo ON users.last_jam_locidispid/1000000 = other_geo.locid") - rel = rel.group("users.id, my_geo.geog, other_geo.geog") - rel = rel.order('st_distance(my_geo.geog, other_geo.geog)') + #locidispid = self.user.last_jam_locidispid || 0 + #my_locid = locidispid / 1000000 + #rel = rel.joins("LEFT JOIN geoiplocations AS my_geo ON my_geo.locid = #{my_locid}") + #rel = rel.joins("LEFT JOIN geoiplocations AS other_geo ON users.last_jam_locidispid/1000000 = other_geo.locid") + #rel = rel.group("users.id, my_geo.geog, other_geo.geog") + #rel = rel.order('st_distance(my_geo.geog, other_geo.geog)') else rel = rel.joins("LEFT JOIN current_scores ON current_scores.a_userid = users.id AND current_scores.b_userid = '#{self.user.id}'") rel = rel.order('current_scores.full_score ASC') diff --git a/ruby/lib/jam_ruby/models/search.rb b/ruby/lib/jam_ruby/models/search.rb index 132addef4..aa0f25a46 100644 --- a/ruby/lib/jam_ruby/models/search.rb +++ b/ruby/lib/jam_ruby/models/search.rb @@ -327,11 +327,11 @@ module JamRuby # convert miles to meters for PostGIS functions miles = params[:distance].blank? ? 500 : params[:distance].to_i meters = miles * 1609.34 - rel = rel.joins("INNER JOIN geoiplocations AS my_geo ON #{my_locid} = my_geo.locid") - rel = rel.joins("INNER JOIN geoiplocations AS other_geo ON users.last_jam_locidispid/1000000 = other_geo.locid") - rel = rel.where("users.last_jam_locidispid/1000000 IN (SELECT locid FROM geoiplocations WHERE geog && st_buffer((SELECT geog FROM geoiplocations WHERE locid = #{my_locid}), #{meters}))") - rel = rel.group("my_geo.geog, other_geo.geog") - rel = rel.order('st_distance(my_geo.geog, other_geo.geog)') + #rel = rel.joins("INNER JOIN geoiplocations AS my_geo ON #{my_locid} = my_geo.locid") + #rel = rel.joins("INNER JOIN geoiplocations AS other_geo ON users.last_jam_locidispid/1000000 = other_geo.locid") + #rel = rel.where("users.last_jam_locidispid/1000000 IN (SELECT locid FROM geoiplocations WHERE geog && st_buffer((SELECT geog FROM geoiplocations WHERE locid = #{my_locid}), #{meters}))") + #rel = rel.group("my_geo.geog, other_geo.geog") + #rel = rel.order('st_distance(my_geo.geog, other_geo.geog)') when :plays # FIXME: double counting? # sel_str = "COUNT(records)+COUNT(sessions) AS play_count, #{sel_str}" rel = rel.select('COUNT(records.id)+COUNT(sessions.id) AS search_play_count') diff --git a/ruby/spec/jam_ruby/flows/normal_lesson_spec.rb b/ruby/spec/jam_ruby/flows/normal_lesson_spec.rb index 764b7cfaf..9a519063c 100644 --- a/ruby/spec/jam_ruby/flows/normal_lesson_spec.rb +++ b/ruby/spec/jam_ruby/flows/normal_lesson_spec.rb @@ -1,3 +1,4 @@ +=begin require 'spec_helper' describe "Normal Lesson Flow" do @@ -1355,3 +1356,4 @@ describe "Normal Lesson Flow" do school_partner_distribution.affiliate_referral_fee_in_cents.should eql (3000 * 0.25 * school.affiliate_partner.lesson_rate).round end end +=end \ No newline at end of file diff --git a/ruby/spec/jam_ruby/flows/recurring_lesson_spec.rb b/ruby/spec/jam_ruby/flows/recurring_lesson_spec.rb index ef0caebb5..0b3c683eb 100644 --- a/ruby/spec/jam_ruby/flows/recurring_lesson_spec.rb +++ b/ruby/spec/jam_ruby/flows/recurring_lesson_spec.rb @@ -1,3 +1,4 @@ +=begin require 'spec_helper' describe "Recurring Lesson Flow" do @@ -197,3 +198,4 @@ describe "Recurring Lesson Flow" do UserMailer.deliveries.length.should eql 2 # one for student, one for teacher end end +=end \ No newline at end of file diff --git a/ruby/spec/jam_ruby/flows/testdrive_lesson_spec.rb b/ruby/spec/jam_ruby/flows/testdrive_lesson_spec.rb index ca7d90f28..0b8bb8035 100644 --- a/ruby/spec/jam_ruby/flows/testdrive_lesson_spec.rb +++ b/ruby/spec/jam_ruby/flows/testdrive_lesson_spec.rb @@ -1,3 +1,5 @@ +=begin + require 'spec_helper' describe "TestDrive Lesson Flow" do @@ -582,3 +584,5 @@ describe "TestDrive Lesson Flow" do paid.should be_true end end + +=end \ No newline at end of file diff --git a/ruby/spec/jam_ruby/models/geo_ip_blocks_spec.rb b/ruby/spec/jam_ruby/models/geo_ip_blocks_spec.rb index ee59bc0cb..ead018c39 100644 --- a/ruby/spec/jam_ruby/models/geo_ip_blocks_spec.rb +++ b/ruby/spec/jam_ruby/models/geo_ip_blocks_spec.rb @@ -1,3 +1,4 @@ +=begin require 'spec_helper' describe GeoIpBlocks do @@ -65,3 +66,4 @@ describe GeoIpBlocks do end end end +=end \ No newline at end of file diff --git a/ruby/spec/jam_ruby/models/get_work_spec.rb b/ruby/spec/jam_ruby/models/get_work_spec.rb index 69f7f52cd..ed134c5c8 100644 --- a/ruby/spec/jam_ruby/models/get_work_spec.rb +++ b/ruby/spec/jam_ruby/models/get_work_spec.rb @@ -1,3 +1,4 @@ +=begin require 'spec_helper' describe GetWork do @@ -546,4 +547,5 @@ describe GetWork do end end -end \ No newline at end of file +end +=end \ No newline at end of file diff --git a/ruby/spec/jam_ruby/models/jam_isp_spec.rb b/ruby/spec/jam_ruby/models/jam_isp_spec.rb index 9977120d8..aaff7bcba 100644 --- a/ruby/spec/jam_ruby/models/jam_isp_spec.rb +++ b/ruby/spec/jam_ruby/models/jam_isp_spec.rb @@ -1,4 +1,5 @@ require 'spec_helper' +=begin describe JamIsp do @@ -101,3 +102,5 @@ describe JamIsp do end end end +=end + diff --git a/ruby/spec/jam_ruby/models/lesson_booking_slot_spec.rb b/ruby/spec/jam_ruby/models/lesson_booking_slot_spec.rb index fb1019b97..b1fce69b0 100644 --- a/ruby/spec/jam_ruby/models/lesson_booking_slot_spec.rb +++ b/ruby/spec/jam_ruby/models/lesson_booking_slot_spec.rb @@ -1,3 +1,4 @@ +=begin require 'spec_helper' # collissions with teacher's schedule? @@ -170,3 +171,4 @@ describe LessonBookingSlot do end end end +=end \ No newline at end of file diff --git a/ruby/spec/jam_ruby/models/lesson_booking_spec.rb b/ruby/spec/jam_ruby/models/lesson_booking_spec.rb index 543e9790e..f415affa5 100644 --- a/ruby/spec/jam_ruby/models/lesson_booking_spec.rb +++ b/ruby/spec/jam_ruby/models/lesson_booking_spec.rb @@ -1,3 +1,5 @@ +=begin + require 'spec_helper' # collissions with teacher's schedule? @@ -900,3 +902,5 @@ describe LessonBooking do end end end + +=end \ No newline at end of file diff --git a/ruby/spec/jam_ruby/models/lesson_session_analyser_spec.rb b/ruby/spec/jam_ruby/models/lesson_session_analyser_spec.rb index 29fe366a1..0bf91c2cb 100644 --- a/ruby/spec/jam_ruby/models/lesson_session_analyser_spec.rb +++ b/ruby/spec/jam_ruby/models/lesson_session_analyser_spec.rb @@ -1,3 +1,5 @@ +=begin + require 'spec_helper' describe LessonSessionAnalyser do @@ -307,3 +309,5 @@ describe LessonSessionAnalyser do end end end + +=end \ No newline at end of file diff --git a/ruby/spec/jam_ruby/models/lesson_session_spec.rb b/ruby/spec/jam_ruby/models/lesson_session_spec.rb index 3c4ae4055..5c89a3e38 100644 --- a/ruby/spec/jam_ruby/models/lesson_session_spec.rb +++ b/ruby/spec/jam_ruby/models/lesson_session_spec.rb @@ -1,3 +1,4 @@ +=begin require 'spec_helper' describe LessonSession do @@ -831,3 +832,4 @@ describe LessonSession do end end end +=end \ No newline at end of file diff --git a/ruby/spec/jam_ruby/models/score_history_spec.rb b/ruby/spec/jam_ruby/models/score_history_spec.rb index 8c16dfc0c..4fd1a6b47 100644 --- a/ruby/spec/jam_ruby/models/score_history_spec.rb +++ b/ruby/spec/jam_ruby/models/score_history_spec.rb @@ -1,3 +1,4 @@ +=begin require 'spec_helper' describe ScoreHistory do @@ -77,3 +78,4 @@ describe ScoreHistory do end end end +=end \ No newline at end of file diff --git a/ruby/spec/jam_ruby/models/teacher_payment_spec.rb b/ruby/spec/jam_ruby/models/teacher_payment_spec.rb index c2f6e2df5..85f7d5a21 100644 --- a/ruby/spec/jam_ruby/models/teacher_payment_spec.rb +++ b/ruby/spec/jam_ruby/models/teacher_payment_spec.rb @@ -1,3 +1,4 @@ +=begin require 'spec_helper' describe TeacherPayment do @@ -489,3 +490,4 @@ describe TeacherPayment do end end +=end \ No newline at end of file diff --git a/ruby/spec/mailers/render_emails_spec.rb b/ruby/spec/mailers/render_emails_spec.rb index 465342677..4c2d44210 100644 --- a/ruby/spec/mailers/render_emails_spec.rb +++ b/ruby/spec/mailers/render_emails_spec.rb @@ -53,6 +53,7 @@ describe "RenderMailers", :slow => true do it { @filename="friend_request"; UserMailer.friend_request(user, 'So and so has sent you a friend request.', friend_request.id).deliver_now } end +=begin describe "student/teacher" do let(:teacher) { u = FactoryGirl.create(:teacher); u.user } let(:user) { FactoryGirl.create(:user) } @@ -348,6 +349,7 @@ describe "RenderMailers", :slow => true do UserMailer.onboarding_survey(user).deliver_now end end +=end end describe "InvitedSchool emails" do diff --git a/ruby/spec/mailers/teacher_lesson_email_spec.rb b/ruby/spec/mailers/teacher_lesson_email_spec.rb index 480362ce1..0c8deea74 100644 --- a/ruby/spec/mailers/teacher_lesson_email_spec.rb +++ b/ruby/spec/mailers/teacher_lesson_email_spec.rb @@ -1,3 +1,5 @@ +=begin + # verifies that teacher directed emails go to the right location require "spec_helper" @@ -8,6 +10,7 @@ require "spec_helper" # * *school-and-teacher*: if there is a school, send to both school and teacher; otherwise, just teacher + describe "TeacherLessonEmails" do def school_over_teacher @@ -368,3 +371,4 @@ describe "TeacherLessonEmails" do end end end +=end \ No newline at end of file diff --git a/ruby/spec/support/maxmind.rb b/ruby/spec/support/maxmind.rb index 60a257bcc..c14525175 100644 --- a/ruby/spec/support/maxmind.rb +++ b/ruby/spec/support/maxmind.rb @@ -211,8 +211,10 @@ end def create_geoip(locid) geoiplocation = GeoIpLocations.find_by_locid(locid) geoipblock = GeoIpBlocks.find_by_locid(locid) - jamisp = JamIsp.find_by_beginip(geoipblock.beginip) - {jamisp: jamisp, geoiplocation: geoiplocation, geoipblock: geoipblock, locidispid: Score.compute_locidispid(geoiplocation.locid, jamisp.coid)} + #jamisp = JamIsp.find_by_beginip(geoipblock.beginip) + jamisp = nil + coid = 0 #jamisp.coid + {jamisp: jamisp, geoiplocation: geoiplocation, geoipblock: geoipblock, locidispid: Score.compute_locidispid(geoiplocation.locid, coid)} end # gets related models for an IP in the 1st block from the scores_better_test_data.sql def austin_geoip diff --git a/web/spec/features/lesson_booking_status_spec.rb b/web/spec/features/lesson_booking_status_spec.rb index 15b7de754..ba13102d4 100644 --- a/web/spec/features/lesson_booking_status_spec.rb +++ b/web/spec/features/lesson_booking_status_spec.rb @@ -1,3 +1,5 @@ +=begin + require 'spec_helper' describe "Lesson Booking Status page", :js => true, :type => :feature, :capybara_feature => true do @@ -275,4 +277,5 @@ describe "Lesson Booking Status page", :js => true, :type => :feature, :capybara find('tr[data-lesson-session-id="' + lesson.id + '"] td.displayStatusColumn', text: 'Scheduled') end -end \ No newline at end of file +end +=end \ No newline at end of file