Add webmock to intercept real http connections during tests

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 419ea18063bd5873197a3c1388fc31932a5f0256..7624c0b34ed38cac9dd0ea13748a96648cae6abd 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -4,6 +4,7 @@ Coveralls.wear!("rails")
 ENV["RAILS_ENV"] = "test"
 require File.expand_path("../../config/environment", __FILE__)
 require "rails/test_help"
 ENV["RAILS_ENV"] = "test"
 require File.expand_path("../../config/environment", __FILE__)
 require "rails/test_help"

+require "webmock/minitest"

 load "composite_primary_keys/fixtures.rb"
 
 module ActiveSupport
 load "composite_primary_keys/fixtures.rb"
 
 module ActiveSupport


@@ -13,8 +14,8 @@ module ActiveSupport
     # Load standard fixtures needed to test API methods
     def self.api_fixtures
       # print "setting up the api_fixtures"
     # Load standard fixtures needed to test API methods
     def self.api_fixtures
       # print "setting up the api_fixtures"

-      fixtures :users, :user_roles, :user_blocks
-      fixtures :changesets, :changeset_tags, :changeset_comments
+      fixtures :users, :user_roles
+      fixtures :changesets, :changeset_tags

 
       fixtures :current_nodes, :nodes
       set_fixture_class :current_nodes => Node
 
       fixtures :current_nodes, :nodes
       set_fixture_class :current_nodes => Node


@@ -60,8 +61,6 @@ module ActiveSupport
       fixtures :client_applications
 
       fixtures :redactions
       fixtures :client_applications
 
       fixtures :redactions

-
-      fixtures :notes, :note_comments

     end
 
     ##
     end
 
     ##