aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/journey
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/journey')
-rw-r--r--actionpack/test/journey/gtg/builder_test.rb2
-rw-r--r--actionpack/test/journey/gtg/transition_table_test.rb6
-rw-r--r--actionpack/test/journey/nfa/simulator_test.rb12
-rw-r--r--actionpack/test/journey/nfa/transition_table_test.rb2
-rw-r--r--actionpack/test/journey/nodes/symbol_test.rb4
-rw-r--r--actionpack/test/journey/path/pattern_test.rb12
-rw-r--r--actionpack/test/journey/route/definition/parser_test.rb2
-rw-r--r--actionpack/test/journey/route/definition/scanner_test.rb2
-rw-r--r--actionpack/test/journey/route_test.rb4
-rw-r--r--actionpack/test/journey/router/strexp_test.rb2
-rw-r--r--actionpack/test/journey/router/utils_test.rb2
-rw-r--r--actionpack/test/journey/router_test.rb4
-rw-r--r--actionpack/test/journey/routes_test.rb6
13 files changed, 30 insertions, 30 deletions
diff --git a/actionpack/test/journey/gtg/builder_test.rb b/actionpack/test/journey/gtg/builder_test.rb
index a633c3eea6..c1da374007 100644
--- a/actionpack/test/journey/gtg/builder_test.rb
+++ b/actionpack/test/journey/gtg/builder_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
module ActionDispatch
module Journey
module GTG
- class TestBuilder < MiniTest::Unit::TestCase
+ class TestBuilder < ActiveSupport::TestCase
def test_following_states_multi
table = tt ['a|a']
assert_equal 1, table.move([0], 'a').length
diff --git a/actionpack/test/journey/gtg/transition_table_test.rb b/actionpack/test/journey/gtg/transition_table_test.rb
index 6d81b72c41..33acba8b65 100644
--- a/actionpack/test/journey/gtg/transition_table_test.rb
+++ b/actionpack/test/journey/gtg/transition_table_test.rb
@@ -4,7 +4,7 @@ require 'json'
module ActionDispatch
module Journey
module GTG
- class TestGeneralizedTable < MiniTest::Unit::TestCase
+ class TestGeneralizedTable < ActiveSupport::TestCase
def test_to_json
table = tt %w{
/articles(.:format)
@@ -29,7 +29,7 @@ module ActionDispatch
}
svg = table.to_svg
assert svg
- refute_match(/DOCTYPE/, svg)
+ assert_no_match(/DOCTYPE/, svg)
end
end
@@ -53,7 +53,7 @@ module ActionDispatch
sim = simulator_for ['/foo(/bar)']
assert_match sim, '/foo'
assert_match sim, '/foo/bar'
- refute_match sim, '/foo/'
+ assert_no_match sim, '/foo/'
end
def test_match_data
diff --git a/actionpack/test/journey/nfa/simulator_test.rb b/actionpack/test/journey/nfa/simulator_test.rb
index 9f89329b57..673a491fe5 100644
--- a/actionpack/test/journey/nfa/simulator_test.rb
+++ b/actionpack/test/journey/nfa/simulator_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
module ActionDispatch
module Journey
module NFA
- class TestSimulator < MiniTest::Unit::TestCase
+ class TestSimulator < ActiveSupport::TestCase
def test_simulate_simple
sim = simulator_for ['/foo']
assert_match sim, '/foo'
@@ -11,17 +11,17 @@ module ActionDispatch
def test_simulate_simple_no_match
sim = simulator_for ['/foo']
- refute_match sim, 'foo'
+ assert_no_match sim, 'foo'
end
def test_simulate_simple_no_match_too_long
sim = simulator_for ['/foo']
- refute_match sim, '/foo/bar'
+ assert_no_match sim, '/foo/bar'
end
def test_simulate_simple_no_match_wrong_string
sim = simulator_for ['/foo']
- refute_match sim, '/bar'
+ assert_no_match sim, '/bar'
end
def test_simulate_regex
@@ -34,14 +34,14 @@ module ActionDispatch
sim = simulator_for ['/foo', '/bar']
assert_match sim, '/bar'
assert_match sim, '/foo'
- refute_match sim, '/baz'
+ assert_no_match sim, '/baz'
end
def test_simulate_optional
sim = simulator_for ['/foo(/bar)']
assert_match sim, '/foo'
assert_match sim, '/foo/bar'
- refute_match sim, '/foo/'
+ assert_no_match sim, '/foo/'
end
def test_matchdata_has_memos
diff --git a/actionpack/test/journey/nfa/transition_table_test.rb b/actionpack/test/journey/nfa/transition_table_test.rb
index 72cefe42bf..1248082c03 100644
--- a/actionpack/test/journey/nfa/transition_table_test.rb
+++ b/actionpack/test/journey/nfa/transition_table_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
module ActionDispatch
module Journey
module NFA
- class TestTransitionTable < MiniTest::Unit::TestCase
+ class TestTransitionTable < ActiveSupport::TestCase
def setup
@parser = Journey::Parser.new
end
diff --git a/actionpack/test/journey/nodes/symbol_test.rb b/actionpack/test/journey/nodes/symbol_test.rb
index f53840274a..d411a5018a 100644
--- a/actionpack/test/journey/nodes/symbol_test.rb
+++ b/actionpack/test/journey/nodes/symbol_test.rb
@@ -3,13 +3,13 @@ require 'abstract_unit'
module ActionDispatch
module Journey
module Nodes
- class TestSymbol < MiniTest::Unit::TestCase
+ class TestSymbol < ActiveSupport::TestCase
def test_default_regexp?
sym = Symbol.new nil
assert sym.default_regexp?
sym.regexp = nil
- refute sym.default_regexp?
+ assert_not sym.default_regexp?
end
end
end
diff --git a/actionpack/test/journey/path/pattern_test.rb b/actionpack/test/journey/path/pattern_test.rb
index 0f2d0d44c0..2b7227cd0d 100644
--- a/actionpack/test/journey/path/pattern_test.rb
+++ b/actionpack/test/journey/path/pattern_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
module ActionDispatch
module Journey
module Path
- class TestPattern < MiniTest::Unit::TestCase
+ class TestPattern < ActiveSupport::TestCase
x = /.+/
{
'/:controller(/:action)' => %r{\A/(#{x})(?:/([^/.?]+))?\Z},
@@ -88,7 +88,7 @@ module ActionDispatch
path = Pattern.new strexp
assert_match(path, '/page/tender')
assert_match(path, '/page/love')
- refute_match(path, '/page/loving')
+ assert_no_match(path, '/page/loving')
end
def test_optional_names
@@ -110,7 +110,7 @@ module ActionDispatch
)
path = Pattern.new strexp
assert_match(path, '/123')
- refute_match(path, '/')
+ assert_no_match(path, '/')
end
def test_to_regexp_with_group
@@ -122,7 +122,7 @@ module ActionDispatch
path = Pattern.new strexp
assert_match(path, '/page/tender')
assert_match(path, '/page/love')
- refute_match(path, '/page/loving')
+ assert_no_match(path, '/page/loving')
end
def test_ast_sets_regular_expressions
@@ -189,7 +189,7 @@ module ActionDispatch
path = Pattern.new strexp
assert_match(path, '/page/TENDER/aaron')
assert_match(path, '/page/loVE/aaron')
- refute_match(path, '/page/loVE/AAron')
+ assert_no_match(path, '/page/loVE/AAron')
end
def test_to_regexp_with_strexp
@@ -210,7 +210,7 @@ module ActionDispatch
path = Pattern.new '/:controller(/:action(/:id(.:format)))'
uri = 'content'
- refute path =~ uri
+ assert_not path =~ uri
end
def test_match_controller
diff --git a/actionpack/test/journey/route/definition/parser_test.rb b/actionpack/test/journey/route/definition/parser_test.rb
index 580235c6a1..d7d7172a40 100644
--- a/actionpack/test/journey/route/definition/parser_test.rb
+++ b/actionpack/test/journey/route/definition/parser_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
module ActionDispatch
module Journey
module Definition
- class TestParser < MiniTest::Unit::TestCase
+ class TestParser < ActiveSupport::TestCase
def setup
@parser = Parser.new
end
diff --git a/actionpack/test/journey/route/definition/scanner_test.rb b/actionpack/test/journey/route/definition/scanner_test.rb
index 110baf9977..624e6df51a 100644
--- a/actionpack/test/journey/route/definition/scanner_test.rb
+++ b/actionpack/test/journey/route/definition/scanner_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
module ActionDispatch
module Journey
module Definition
- class TestScanner < MiniTest::Unit::TestCase
+ class TestScanner < ActiveSupport::TestCase
def setup
@scanner = Scanner.new
end
diff --git a/actionpack/test/journey/route_test.rb b/actionpack/test/journey/route_test.rb
index b205db5fbc..78608a5c6b 100644
--- a/actionpack/test/journey/route_test.rb
+++ b/actionpack/test/journey/route_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
module ActionDispatch
module Journey
- class TestRoute < MiniTest::Unit::TestCase
+ class TestRoute < ActiveSupport::TestCase
def test_initialize
app = Object.new
path = Path::Pattern.new '/:controller(/:action(/:id(.:format)))'
@@ -92,7 +92,7 @@ module ActionDispatch
routes = [specific, generic]
- refute_equal specific.score(knowledge), generic.score(knowledge)
+ assert_not_equal specific.score(knowledge), generic.score(knowledge)
found = routes.sort_by { |r| r.score(knowledge) }.last
diff --git a/actionpack/test/journey/router/strexp_test.rb b/actionpack/test/journey/router/strexp_test.rb
index 9e0337f144..7ccdfb7b4d 100644
--- a/actionpack/test/journey/router/strexp_test.rb
+++ b/actionpack/test/journey/router/strexp_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
module ActionDispatch
module Journey
class Router
- class TestStrexp < MiniTest::Unit::TestCase
+ class TestStrexp < ActiveSupport::TestCase
def test_many_names
exp = Strexp.new(
"/:controller(/:action(/:id(.:format)))",
diff --git a/actionpack/test/journey/router/utils_test.rb b/actionpack/test/journey/router/utils_test.rb
index 97a6449c99..057dc40cca 100644
--- a/actionpack/test/journey/router/utils_test.rb
+++ b/actionpack/test/journey/router/utils_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
module ActionDispatch
module Journey
class Router
- class TestUtils < MiniTest::Unit::TestCase
+ class TestUtils < ActiveSupport::TestCase
def test_path_escape
assert_equal "a/b%20c+d", Utils.escape_path("a/b c+d")
end
diff --git a/actionpack/test/journey/router_test.rb b/actionpack/test/journey/router_test.rb
index 1b64600ba8..27bdb0108a 100644
--- a/actionpack/test/journey/router_test.rb
+++ b/actionpack/test/journey/router_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
module ActionDispatch
module Journey
- class TestRouter < MiniTest::Unit::TestCase
+ class TestRouter < ActiveSupport::TestCase
attr_reader :routes
def setup
@@ -277,7 +277,7 @@ module ActionDispatch
@router.recognize(env) do |*whatever|
yielded = true
end
- refute yielded
+ assert_not yielded
end
def test_required_part_in_recall
diff --git a/actionpack/test/journey/routes_test.rb b/actionpack/test/journey/routes_test.rb
index 3b17bd53b7..25e0321d31 100644
--- a/actionpack/test/journey/routes_test.rb
+++ b/actionpack/test/journey/routes_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
module ActionDispatch
module Journey
- class TestRoutes < MiniTest::Unit::TestCase
+ class TestRoutes < ActiveSupport::TestCase
def test_clear
routes = Routes.new
exp = Router::Strexp.new '/foo(/:id)', {}, ['/.?']
@@ -23,7 +23,7 @@ module ActionDispatch
routes.add_route nil, path, {}, {}, {}
ast = routes.ast
routes.add_route nil, path, {}, {}, {}
- refute_equal ast, routes.ast
+ assert_not_equal ast, routes.ast
end
def test_simulator_changes
@@ -33,7 +33,7 @@ module ActionDispatch
routes.add_route nil, path, {}, {}, {}
sim = routes.simulator
routes.add_route nil, path, {}, {}, {}
- refute_equal sim, routes.simulator
+ assert_not_equal sim, routes.simulator
end
def test_first_name_wins
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-14 13:04:16 +0000