WIP: Fixing tests and code for the Team functionality

just3ws · just3ws · commit edfddb2529fc · 2014-11-26T17:14:11.000-06:00
diff --git a/app/models/team.rb b/app/models/team.rb
@@ -125,7 +125,8 @@ def self.completed_at_least(section_count = 6, page=1, per_page=Team.count, sear
   end
 
   def self.with_similar_names(name)
-    Team.where('name ilike ?', "#{name.gsub!(/ \-\./, '.*')}%").limit(3).to_a
+    pattern = "%#{name}%"
+    Team.where('name ilike ?', pattern).limit(3).to_a
   end
 
   def self.with_completed_section(section)
@@ -430,15 +431,6 @@ def sorted_members
     @sorted_members = members.order('score_cache DESC')
   end
 
-  def add_user(user)
-    touch!
-
-    user.tap do |u|
-      u.update_attribute(:team_document_id, id.to_s)
-      u.save!
-    end
-  end
-
   def add_member(user)
     Rails.logger.warn("Called #{self.class.name}#add_member(#{user.inspect}")
 
@@ -449,6 +441,7 @@ def add_member(user)
     save!
     member
   end
+  alias_method :add_user, :add_member
 
   def remove_member(user)
     return nil unless member = members.select { |m| m.user_id == user.id }
diff --git a/app/models/teams/member.rb b/app/models/teams/member.rb
@@ -33,6 +33,7 @@ def display_name
     speciality_tags
     state_name
     country
+    referral_token
   ).each do |user_method|
     delegate user_method, to: :user
   end
diff --git a/spec/models/team_spec.rb b/spec/models/team_spec.rb
@@ -1,6 +1,9 @@
 require 'rails_helper'
 
-RSpec.describe Team, type: :model, skip: true do
+RSpec.describe Team, type: :model do
+  let(:team)         { Fabricate(:team) }
+  let(:invitee)      { Fabricate(:user) }
+
   it { is_expected.to have_one :account }
 
   it { is_expected.to have_many :locations }
@@ -20,14 +23,14 @@
     end
 
     it 'returns teams using wildcards' do
-      result = Team.with_similar_names('dr -.')
+      result = Team.with_similar_names('dr%')
       expect(result).to include(team_1, team_2)
     end
   end
 
   it 'adds the team id to the user when they are added to a team' do
     team.add_user(invitee)
-    expect(invitee.reload.team).to eq(team)
+    expect(invitee.reload.membership.team).to eq(team)
   end
 
   it 'should indicate if team member has referral' do
@@ -55,7 +58,7 @@
     expect(team.slug).to eq('tilde-inc')
   end
 
-  it 'should clear the cache when a premium team is updated' do
+  skip 'should clear the cache when a premium team is updated' do
     # TODO: Refactor api calls to Sidekiq job
     VCR.use_cassette('Opportunity') do
       seed_plans!
@@ -76,11 +79,7 @@
   end
 
   it 'should be able to add team link' do
-    team.update_attributes(
-      featured_links: [{
-        name: 'Google',
-        url: 'http://www.google.com'
-      }])
+    team.links.create(name: 'Google', url: 'http://www.google.com')
     expect(team.featured_links.size).to eq(1)
   end
 
