Skip to content

Commit bdb124d

Browse files
committed
♻️ Refactor test requires for proper load order
1 parent 9c60f23 commit bdb124d

File tree

4 files changed

+24
-14
lines changed

4 files changed

+24
-14
lines changed

test/helper.rb

-6
This file was deleted.

test/support/logging.rb

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
require "logger"
2+
3+
module TestLogging
4+
LOGGER = Logger.new($stdout)
5+
end
6+
7+
TestLogging::LOGGER.level = Logger::WARN

test/test_helper.rb

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# External dependencies
22
require "byebug" if ENV.fetch("DEBUG", "false").casecmp?("true")
3+
require "net/http"
4+
require "rack"
5+
require "rack/session"
6+
7+
# testing libraries
8+
require "minitest/rg"
9+
10+
# Test support
11+
require "support/logging"
312

413
## Last thing before loading this gem is to setup code coverage
514
begin
@@ -11,12 +20,11 @@
1120
nil
1221
end
1322

14-
# Testing libraries
23+
# Testing libraries that need to load after simplecov
1524
require "minitest/autorun"
16-
require "minitest/rg"
17-
require "net/http"
18-
require "rack"
19-
require "rack/session"
2025

2126
# Internal dependencies & mixins
22-
require_relative "helper"
27+
require "rack/openid"
28+
require "rack/openid/simple_auth"
29+
30+
OpenID::Util.logger = TestLogging::LOGGER

test/test_integration.rb

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# External libraries
2+
require "rots"
3+
14
require_relative "test_helper"
25

36
describe "integration" do
@@ -30,8 +33,6 @@ def fetch(url, body = nil, headers = nil, limit = nil)
3033
ROTS_SERVER_URL = "http://localhost:9292"
3134

3235
RotsApp = Rack::Builder.new do
33-
require "rots"
34-
3536
config = {
3637
"identity" => "john.doe",
3738
"sreg" => {

0 commit comments

Comments
 (0)