Fix identical locations, revive opportunity specs

rohitpaulk · rohitpaulk · commit 93636bef6406 · 2015-02-05T23:21:56.000+05:30
locations.where doesn't include new records that aren't saved to the db, use `select` instead

+ Delete extra 'job' fabricator
diff --git a/app/models/opportunity.rb b/app/models/opportunity.rb
@@ -277,8 +277,8 @@ def add_opportunity_locations_to_team
     geocoded_all = true
     location.split('|').each do |location_string|
       # skip if location is anywhere or already exists
-      if anywhere?(location_string) || team.locations.where('address ILIKE ?',"%location_string%").count > 0
-          geocoded_all = false
+      if anywhere?(location_string) || team.locations.select{|v| v.address.include?(location_string)}.count > 0
+        geocoded_all = false
         next
       end
 
diff --git a/spec/fabricators/opportunity_fabricator.rb b/spec/fabricators/opportunity_fabricator.rb
@@ -36,7 +36,3 @@
   remote false
   expires_at { Time.now + 1.year }
 end
-
-Fabricator(:job, from: :opportunity, class_name: :opportunity) do
-
-end
diff --git a/spec/models/opportunity_spec.rb b/spec/models/opportunity_spec.rb
@@ -27,140 +27,102 @@
 
 require 'spec_helper'
 
-RSpec.describe Opportunity, type: :model, skip: true do
-  # before(:each) do
-  # FakeWeb.register_uri(:get, 'http://maps.googleapis.com/maps/api/geocode/json?address=San+Francisco%2C+CA&language=en&sensor=false', body: File.read(File.join(Rails.root, 'spec', 'fixtures', 'google_maps.json')))
-  # end
-
-  describe 'creating and validating a new opportunity' do
-    it 'should create a valid opportunity' do
-      # TODO: Refactor api calls to Sidekiq job
-			   VCR.use_cassette('Opportunity') do
-
-           tags = ['rails', 'sinatra', 'JQuery', 'Clean, beautiful code']
-           opportunity = Fabricate(:opportunity, tags: tags)
-           opportunity.save!
-           expect(opportunity.name).not_to be_nil
-           expect(opportunity.description).not_to be_nil
-           expect(opportunity.team_id).not_to be_nil
-           expect(opportunity.tags.size).to eq(tags.size)
-           expect(opportunity.cached_tags).to eq(tags.join(','))
-
-         end
-    end
-
-    it 'can create opportunity with no tags without error' do
-      # TODO: Refactor api calls to Sidekiq job
-			   VCR.use_cassette('Opportunity') do
-
-         	 skip 'need to upgrade to latest rocket tag'
-         	 expect { Fabricate(:opportunity, tags: '') }.not_to raise_error
-
-         end
+RSpec.describe Opportunity, type: :model do
+
+  it 'should create a valid opportunity' do
+    VCR.use_cassette('Opportunity') do
+      tags = ['rails', 'sinatra', 'JQuery']
+      opportunity = Fabricate(:opportunity, tag_list: tags)
+      opportunity.save!
+      expect(opportunity.name).not_to be_nil
+      expect(opportunity.description).not_to be_nil
+      expect(opportunity.team_id).not_to be_nil
+      expect(opportunity.tags.size).to eq(tags.size)
+      expect(opportunity.cached_tags).to eq(tags.map(&:downcase).join(','))
     end
   end
 
   describe 'destroying opportunity' do
     it 'should not destroy the opportunity and only lazy delete it' do
-      # TODO: Refactor api calls to Sidekiq job
-			   VCR.use_cassette('Opportunity') do
-
-           opportunity = Fabricate(:opportunity)
-           opportunity.save
-           expect(opportunity.deleted).to be_falsey
-           opportunity.destroy
-           expect(opportunity).to be_valid
-           expect(opportunity.deleted).to be_truthy
-           expect(opportunity.deleted_at).not_to be_nil
-
-         end
+      VCR.use_cassette('Opportunity') do
+        opportunity = Fabricate(:opportunity)
+        opportunity.save
+        expect(opportunity.deleted).to be_falsey
+        opportunity.destroy
+        expect(opportunity).to be_valid
+        expect(opportunity.deleted).to be_truthy
+        expect(opportunity.deleted_at).not_to be_nil
+      end
     end
   end
 
   describe 'apply for job' do
     it 'should create a valid application' do
-      # TODO: Refactor api calls to Sidekiq job
-			   VCR.use_cassette('Opportunity') do
-
-           job = Fabricate(:job)
-           job.salary = 25_000
-           user = Fabricate(:user)
-           job.apply_for(user)
-           expect(job.applicants.size).to eq(1)
-           expect(job.applicants.first).to eq(user)
-
-         end
+      VCR.use_cassette('Opportunity') do
+        job = Fabricate(:opportunity)
+        job.salary = 25_000
+        user = Fabricate(:user)
+        job.apply_for(user)
+        expect(job.applicants.size).to eq(1)
+        expect(job.applicants.first).to eq(user)
+      end
     end
 
     it 'should not allow multiple applications' do
-      # TODO: Refactor api calls to Sidekiq job
-			   VCR.use_cassette('Opportunity') do
-
-           job = Fabricate(:job)
-           user = Fabricate(:user)
-           expect(user.already_applied_for?(job)).to be_falsey
-           expect(job.has_application_from?(user)).to be_falsey
-           job.apply_for(user)
-           user.apply_to(job)
-           expect(job.applicants.size).to eq(1)
-           expect(job.applicants.first).to eq(user)
-           expect(user.already_applied_for?(job)).to be_truthy
-           expect(job.has_application_from?(user)).to be_truthy
-
-         end
+      VCR.use_cassette('Opportunity') do
+        job = Fabricate(:opportunity)
+        user = Fabricate(:user)
+        expect(user.already_applied_for?(job)).to be_falsey
+        expect(job.has_application_from?(user)).to be_falsey
+        job.apply_for(user)
+        user.apply_to(job)
+        expect(job.applicants.size).to eq(1)
+        expect(job.applicants.first).to eq(user)
+        expect(user.already_applied_for?(job)).to be_truthy
+        expect(job.has_application_from?(user)).to be_truthy
+      end
     end
   end
 
   describe 'changing job location' do
     it 'should set location_city' do
-      # TODO: Refactor api calls to Sidekiq job
-			   VCR.use_cassette('Opportunity') do
-
-           job = Fabricate(:job)
-           job.location = 'Amsterdam|San Francisco'
-           job.save
-           expect(job.location_city.split('|') - ['Amsterdam', 'San Francisco']).to eq([])
-
-         end
+      VCR.use_cassette('Opportunity') do
+        job = Fabricate(:opportunity)
+        expect(job.location_city.split('|')).to match_array(['San Francisco'])
+        job.location = 'Amsterdam|San Francisco'
+        job.save
+        expect(job.location_city.split('|')).to match_array(['Amsterdam', 'San Francisco'])
+      end
     end
 
     it 'should not add anywhere to location_city' do
-      # TODO: Refactor api calls to Sidekiq job
-			   VCR.use_cassette('Opportunity') do
-
-           job = Fabricate(:job)
-           job.location = 'Amsterdam|San Francisco|anywhere'
-           job.save
-           expect(job.location_city.split('|') - ['Amsterdam', 'San Francisco']).to eq([])
-
-         end
+			VCR.use_cassette('Opportunity') do
+        job = Fabricate(:opportunity)
+        job.location = 'Amsterdam|San Francisco|anywhere'
+        job.save
+        expect(job.location_city.split('|')).to match_array(['Amsterdam', 'San Francisco'])
+      end
     end
 
     it 'should update location_city with changes' do
-      # TODO: Refactor api calls to Sidekiq job
-			   VCR.use_cassette('Opportunity') do
-
-           job = Fabricate(:job)
-           job.location = 'Amsterdam|San Francisco'
-           job.save
-           expect(job.location_city.split('|') - ['Amsterdam', 'San Francisco']).to eq([])
-           job.location = 'Amsterdam'
-           job.save
-           expect(job.location_city).to eq('Amsterdam')
-
-         end
+			VCR.use_cassette('Opportunity') do
+        job = Fabricate(:opportunity)
+        job.location = 'Amsterdam|San Francisco'
+        job.save
+        expect(job.location_city.split('|')).to match_array(['Amsterdam', 'San Francisco'])
+        job.location = 'Amsterdam'
+        job.save
+        expect(job.location_city).to eq('Amsterdam')
+      end
     end
 
     it 'should not add existing locations to the team' do
-      # TODO: Refactor api calls to Sidekiq job
-			   VCR.use_cassette('Opportunity') do
-
-           job = Fabricate(:job)
-           job.location = 'San Francisco'
-           job.save
-           expect(job.team.locations.count).to be === 1
-
-         end
+      VCR.use_cassette('Opportunity') do
+        job = Fabricate(:opportunity)
+        job.location = 'San Francisco'
+        job.save
+        expect(job.team.locations.count).to eq(1)
+      end
     end
   end
 end
