Removed the before(:all) that reindexed Teams and reseeded Plans whether it was needed or not

just3ws · just3ws · commit 6c91237b5a2b · 2014-05-14T12:39:33.000-05:00
diff --git a/app/models/plan.rb b/app/models/plan.rb
@@ -53,14 +53,6 @@ def enhanced_team_page_free
       Plan.where(interval: MONTHLY).where(amount: 0).first
     end
 
-    def seed_plans!(reset=false)
-      Plan.destroy_all if reset
-      Plan.create(amount: 0, interval: Plan::MONTHLY, name: "Basic") if enhanced_team_page_free.nil?
-      Plan.create(amount: 9900, interval: Plan::MONTHLY, name: "Monthly") if enhanced_team_page_monthly.nil?
-      Plan.create(amount: 19900, interval: nil, name: "Single") if enhanced_team_page_one_time.nil?
-      Plan.create(amount: 19900, interval: Plan::MONTHLY, analytics: true, name: "Analytics") if enhanced_team_page_analytics.nil?
-    end
-
   end
 
   def register_on_stripe
diff --git a/app/models/team.rb b/app/models/team.rb
@@ -210,16 +210,6 @@ def with_completed_section(section)
       empty = Team.new.send(section).is_a?(Array) ? [] : nil
       Team.where(section.to_sym.ne => empty)
     end
-
-    def rebuild_index(name = nil)
-      raise "Unable to rebuild search index in production because it is disabled by bonsai" if Rails.env.staging? || Rails.env.production?
-      klass = self
-      Tire.index name || self.index_name || self.class.name do
-        delete
-        create
-        klass.all.in_groups_of(1000) { |batch| import batch }
-      end
-    end
   end
 
   def relevancy
diff --git a/spec/models/team_spec.rb b/spec/models/team_spec.rb
@@ -37,6 +37,7 @@
   end
 
   it 'should clear the cache when a premium team is updated' do
+    seed_plans!
     Rails.cache.write(Team::FEATURED_TEAMS_CACHE_KEY, 'test')
     team.team_members << admin = Fabricate(:user)
     team.build_account
@@ -54,10 +55,18 @@
 
   it 'should be able to add team link' do
     team.update_attributes(
-        featured_links: [{
-                             name: 'Google',
-                             url: 'http://www.google.com'
-                         }])
+      featured_links: [{
+        name: 'Google',
+        url: 'http://www.google.com'
+      }])
     team.featured_links.should have(1).link
   end
-end
+
+  def seed_plans!(reset=false)
+    Plan.destroy_all if reset
+    Plan.create(amount: 0, interval: Plan::MONTHLY, name: "Basic") if Plan.enhanced_team_page_free.nil?
+    Plan.create(amount: 9900, interval: Plan::MONTHLY, name: "Monthly") if Plan.enhanced_team_page_monthly.nil?
+    Plan.create(amount: 19900, interval: nil, name: "Single") if Plan.enhanced_team_page_one_time.nil?
+    Plan.create(amount: 19900, interval: Plan::MONTHLY, analytics: true, name: "Analytics") if Plan.enhanced_team_page_analytics.nil?
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -28,8 +28,6 @@
     REDIS.SELECT(testdb = 1)
     REDIS.flushdb
 
-    Team.rebuild_index
-    Plan.seed_plans!
   end
 
   config.before(:suite) do
