Replace WordPress logo with correct version

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 15b03b4da1919c24623484c5dd6d3ea6d5eebaf0..e3d9f0ff86ad692006898cb0ce458ce64b22b1fc 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -8,11 +8,13 @@ load "composite_primary_keys/fixtures.rb"
 
 module ActiveSupport
   class TestCase
 
 module ActiveSupport
   class TestCase

+    include FactoryGirl::Syntax::Methods
+

     # Load standard fixtures needed to test API methods
     def self.api_fixtures
       # print "setting up the api_fixtures"
       fixtures :users, :user_roles, :user_blocks
     # 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 :changesets, :changeset_tags

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


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

-
-      fixtures :notes, :note_comments

     end
 
     ##
     end
 
     ##


@@ -167,8 +167,8 @@ module ActiveSupport
 
         OSM.http_client = Faraday.new do |builder|
           builder.adapter :test do |stub|
 
         OSM.http_client = Faraday.new do |builder|
           builder.adapter :test do |stub|

-            stubs.each do |url, body|
-              stub.get(url) { |_env| [200, {}, body] }
+            stubs.each do |url, response|
+              stub.get(url) { |_env| [response["code"], {}, response["body"]] }

             end
           end
         end
             end
           end
         end