When overriding setup make sure to call the superclass

diff --git a/test/controllers/api/notes_controller_test.rb b/test/controllers/api/notes_controller_test.rb
index 5f449f0d6ddc1b8769675ab738d2fe8b602443f5..54a20028de33846cfee627ca23769708d280e9b0 100644 (file)
--- a/test/controllers/api/notes_controller_test.rb
+++ b/test/controllers/api/notes_controller_test.rb
@@ -3,6 +3,7 @@ require "test_helper"
 module Api
   class NotesControllerTest < ActionController::TestCase
     def setup
 module Api
   class NotesControllerTest < ActionController::TestCase
     def setup

+      super

       # Stub nominatim response for note locations
       stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/reverse\?})
         .to_return(:status => 404)
       # Stub nominatim response for note locations
       stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/reverse\?})
         .to_return(:status => 404)

diff --git a/test/controllers/api/users_controller_test.rb b/test/controllers/api/users_controller_test.rb
index 93a7eeb5581932fd482dd2d884f981de9938501d..de402ebf8ea80080c6c1fe8bdbcbd44d98fb5b0b 100644 (file)
--- a/test/controllers/api/users_controller_test.rb
+++ b/test/controllers/api/users_controller_test.rb
@@ -3,6 +3,8 @@ require "test_helper"
 module Api
   class UsersControllerTest < ActionController::TestCase
     def setup
 module Api
   class UsersControllerTest < ActionController::TestCase
     def setup

+      super
+

       stub_hostip_requests
     end
 
       stub_hostip_requests
     end
 

diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb
index 8414e18a704883272a74027021cb799b0b975879..e959133a0afb7c5ee44c829c5764528cfaf0ed69 100644 (file)
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@ -4,6 +4,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
   include ActionView::Helpers::NumberHelper
 
   def setup
   include ActionView::Helpers::NumberHelper
 
   def setup

+    super

     # Create the default language for diary entries
     create(:language, :code => "en")
     # Stub nominatim response for diary entry locations
     # Create the default language for diary entries
     create(:language, :code => "en")
     # Stub nominatim response for diary entry locations

diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
index 82821de6c0725db74b7e0864706e79e2fd96ec78..5c71d722fa1518213e9f529b9be65e3df4a8f008 100644 (file)
--- a/test/controllers/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -2,6 +2,7 @@ require "test_helper"
 
 class NotesControllerTest < ActionController::TestCase
   def setup
 
 class NotesControllerTest < ActionController::TestCase
   def setup

+    super

     # Stub nominatim response for note locations
     stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/reverse\?})
       .to_return(:status => 404)
     # Stub nominatim response for note locations
     stub_request(:get, %r{^https://nominatim\.openstreetmap\.org/reverse\?})
       .to_return(:status => 404)

diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb
index a2ea86f6f661c2c469a3c472dab5c197739e4c6b..c7826062ba52ba7aca177f3b4412df75c5135510 100644 (file)
--- a/test/controllers/site_controller_test.rb
+++ b/test/controllers/site_controller_test.rb
@@ -4,6 +4,8 @@ class SiteControllerTest < ActionController::TestCase
   ##
   # setup oauth keys
   def setup
   ##
   # setup oauth keys
   def setup

+    super
+

     Settings.id_key = create(:client_application).key
     Settings.potlatch2_key = create(:client_application).key
 
     Settings.id_key = create(:client_application).key
     Settings.potlatch2_key = create(:client_application).key
 

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 62e06fc58d0e3d339d620cdd53a131662e3e3cfb..feca92df56dbcbe594bdbc2b756b2df737d3c398 100644 (file)
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -2,6 +2,8 @@ require "test_helper"
 
 class UsersControllerTest < ActionController::TestCase
   def setup
 
 class UsersControllerTest < ActionController::TestCase
   def setup

+    super
+

     stub_hostip_requests
   end
 
     stub_hostip_requests
   end