From 2a5861e8a71a1528e7e559ce709dc4f313a429b5 Mon Sep 17 00:00:00 2001
From: Mario Visic <mario@mariovisic.com>
Date: Fri, 25 Nov 2011 23:59:44 +1100
Subject: [PATCH] Specs now correctly use a multisite test app.

---
 spec/lib/locomotive/bushido_spec.rb                 | 5 -----
 spec/lib/locomotive/heroku_spec.rb                  | 5 -----
 spec/lib/locomotive/render_spec.rb                  | 6 ------
 spec/lib/locomotive/routing/site_dispatcher_spec.rb | 7 -------
 spec/models/locomotive/account_spec.rb              | 6 ------
 spec/models/locomotive/content_instance_spec.rb     | 5 -----
 spec/models/locomotive/content_type_spec.rb         | 5 -----
 spec/models/locomotive/page_spec.rb                 | 5 -----
 spec/spec_helper.rb                                 | 4 ++++
 spec/support/factories.rb                           | 6 +++---
 10 files changed, 7 insertions(+), 47 deletions(-)

diff --git a/spec/lib/locomotive/bushido_spec.rb b/spec/lib/locomotive/bushido_spec.rb
index b34eec6e..3c5abba8 100644
--- a/spec/lib/locomotive/bushido_spec.rb
+++ b/spec/lib/locomotive/bushido_spec.rb
@@ -181,9 +181,4 @@ describe 'Bushido support' do
       load 'site.rb'
     end
   end
-
-  after(:all) do
-    Locomotive.configure_for_test(true)
-  end
-
 end
diff --git a/spec/lib/locomotive/heroku_spec.rb b/spec/lib/locomotive/heroku_spec.rb
index 0a6285ee..9c89035d 100644
--- a/spec/lib/locomotive/heroku_spec.rb
+++ b/spec/lib/locomotive/heroku_spec.rb
@@ -172,9 +172,4 @@ describe 'Heroku support' do
       load 'site.rb'
     end
   end
-
-  after(:all) do
-    Locomotive.configure_for_test(true)
-  end
-
 end
diff --git a/spec/lib/locomotive/render_spec.rb b/spec/lib/locomotive/render_spec.rb
index 286d983c..e0de8b58 100644
--- a/spec/lib/locomotive/render_spec.rb
+++ b/spec/lib/locomotive/render_spec.rb
@@ -182,10 +182,4 @@ describe 'Locomotive rendering system' do
     end
 
   end
-
-  after(:all) do
-    ENV['APP_TLD'] = nil
-    Locomotive.configure_for_test(true)
-  end
-
 end
diff --git a/spec/lib/locomotive/routing/site_dispatcher_spec.rb b/spec/lib/locomotive/routing/site_dispatcher_spec.rb
index 360a21ae..90d62260 100644
--- a/spec/lib/locomotive/routing/site_dispatcher_spec.rb
+++ b/spec/lib/locomotive/routing/site_dispatcher_spec.rb
@@ -247,13 +247,6 @@ describe Locomotive::Routing::SiteDispatcher do
       it 'returns false' do
         @controller.send(:validate_site_membership).should be_false
       end
-
     end
-
   end
-
-  # after(:all) do
-  #   Locomotive.configure_for_test(true)
-  # end
-
 end
diff --git a/spec/models/locomotive/account_spec.rb b/spec/models/locomotive/account_spec.rb
index d866bce3..a88a8665 100644
--- a/spec/models/locomotive/account_spec.rb
+++ b/spec/models/locomotive/account_spec.rb
@@ -90,10 +90,4 @@ describe Locomotive::Account do
     end
 
   end
-
-  after(:all) do
-    ENV['APP_TLD'] = nil
-    Locomotive.configure_for_test(true)
-  end
-
 end
diff --git a/spec/models/locomotive/content_instance_spec.rb b/spec/models/locomotive/content_instance_spec.rb
index 503e4578..f33ccf07 100644
--- a/spec/models/locomotive/content_instance_spec.rb
+++ b/spec/models/locomotive/content_instance_spec.rb
@@ -177,11 +177,6 @@ describe Locomotive::ContentInstance do
     end
   end
 
-  after(:all) do
-    ENV['APP_TLD'] = nil
-    Locomotive.configure_for_test(true)
-  end
-
   def build_content(options = {})
     @content_type.contents.build({ :title => 'Locomotive', :description => 'Lorem ipsum....' }.merge(options))
   end
diff --git a/spec/models/locomotive/content_type_spec.rb b/spec/models/locomotive/content_type_spec.rb
index e6cd772b..e1075322 100644
--- a/spec/models/locomotive/content_type_spec.rb
+++ b/spec/models/locomotive/content_type_spec.rb
@@ -260,11 +260,6 @@ describe Locomotive::ContentType do
 
   end
 
-  after(:all) do
-    ENV['APP_TLD'] = nil
-    Locomotive.configure_for_test(true)
-  end
-
   def build_content(content_type)
     content_type.contents.build(:name => 'Asset on steroids', :description => 'Lorem ipsum', :active => true)
   end
diff --git a/spec/models/locomotive/page_spec.rb b/spec/models/locomotive/page_spec.rb
index 3306ef69..7abfada5 100644
--- a/spec/models/locomotive/page_spec.rb
+++ b/spec/models/locomotive/page_spec.rb
@@ -231,9 +231,4 @@ describe Locomotive::Page do
       @page.errors[:redirect_url].should == ["is invalid"]
     end
   end
-
-  after(:all) do
-    ENV['APP_TLD'] = nil
-    Locomotive.configure_for_test(true)
-  end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 10fae0dd..188f49d2 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -17,6 +17,10 @@ RSpec.configure do |config|
 
   config.mock_with :mocha
 
+  config.before(:suite) do
+    Locomotive.configure_for_test(true)
+  end
+
   config.before(:each) do
     Locomotive.config.heroku = false
   end
diff --git a/spec/support/factories.rb b/spec/support/factories.rb
index eb87fa35..e0772c82 100644
--- a/spec/support/factories.rb
+++ b/spec/support/factories.rb
@@ -3,12 +3,12 @@ FactoryGirl.define do
   ## Site ##
   factory :site, :class => Locomotive::Site do
     name 'Acme Website'
-    # subdomain 'acme'
+    subdomain 'acme'
     created_at Time.now
 
     factory "test site" do
       name 'Locomotive test website'
-      # subdomain 'test'
+      subdomain 'test'
 
       after_build do |site_test|
         site_test.memberships.build :account => Locomotive::Account.where(:name => "Admin").first || Factory("admin user"), :role => 'admin'
@@ -16,7 +16,7 @@ FactoryGirl.define do
 
       factory "another site" do
         name "Locomotive test website #2"
-        # subdomain "test2"
+        subdomain "test2"
       end
 
     end