Localisation updates from https://translatewiki.net.

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index dba005145483604835b45f477f22388604dee6b7..7198519a75f4829c88e36da2add6de413a2aa6f0 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -2,51 +2,13 @@ require "coveralls"
 Coveralls.wear!("rails")
 
 ENV["RAILS_ENV"] = "test"
 Coveralls.wear!("rails")
 
 ENV["RAILS_ENV"] = "test"

-require File.expand_path("../../config/environment", __FILE__)
+require File.expand_path("../config/environment", __dir__)

 require "rails/test_help"
 require "webmock/minitest"
 require "rails/test_help"
 require "webmock/minitest"

-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
-      fixtures :changesets
-
-      fixtures :current_nodes, :nodes
-      set_fixture_class :current_nodes => Node
-      set_fixture_class :nodes => OldNode
-
-      fixtures :current_ways
-      set_fixture_class :current_ways => Way
-
-      fixtures :current_way_nodes
-      set_fixture_class :current_way_nodes => WayNode
-
-      fixtures :ways
-      set_fixture_class :ways => OldWay
-
-      fixtures :way_nodes
-      set_fixture_class :way_nodes => OldWayNode
-
-      fixtures :current_relations
-      set_fixture_class :current_relations => Relation
-
-      fixtures :current_relation_members
-      set_fixture_class :current_relation_members => RelationMember
-
-      fixtures :relations
-      set_fixture_class :relations => OldRelation
-
-      fixtures :relation_members
-      set_fixture_class :relation_members => OldRelationMember
-
-      fixtures :redactions
-    end
+    include FactoryBot::Syntax::Methods

 
     ##
     # takes a block which is executed in the context of a different
 
     ##
     # takes a block which is executed in the context of a different


@@ -120,7 +82,7 @@ module ActiveSupport
     ##
     # set request headers for HTTP basic authentication
     def basic_authorization(user, pass)
     ##
     # set request headers for HTTP basic authentication
     def basic_authorization(user, pass)

-      @request.env["HTTP_AUTHORIZATION"] = format("Basic %s", Base64.encode64("#{user}:#{pass}"))
+      @request.env["HTTP_AUTHORIZATION"] = format("Basic %{auth}", :auth => Base64.encode64("#{user}:#{pass}"))

     end
 
     ##
     end
 
     ##


@@ -188,5 +150,13 @@ module ActiveSupport
         end
       end
     end
         end
       end
     end

+
+    def sign_in_as(user)
+      stub_hostip_requests
+      visit login_path
+      fill_in "username", :with => user.email
+      fill_in "password", :with => "test"
+      click_on "Login", :match => :first
+    end

   end
 end
   end
 end