aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/multibyte_normalization_conformance_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/test/multibyte_normalization_conformance_test.rb')
-rw-r--r--activesupport/test/multibyte_normalization_conformance_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/multibyte_normalization_conformance_test.rb b/activesupport/test/multibyte_normalization_conformance_test.rb
index 716e6487aa..e013bd578f 100644
--- a/activesupport/test/multibyte_normalization_conformance_test.rb
+++ b/activesupport/test/multibyte_normalization_conformance_test.rb
@@ -88,7 +88,7 @@ class MultibyteNormalizationConformanceTest < ActiveSupport::TestCase
lines = 0
max_test_lines = 0 # Don't limit below 38, because that's the header of the testfile
File.open(File.join(CACHE_DIR, UNIDATA_FILE), "r") do | f |
- until f.eof? || (max_test_lines > 38 and lines > max_test_lines)
+ until f.eof? || (max_test_lines > 38 && lines > max_test_lines)
lines += 1
line = f.gets.chomp!
next if line.empty? || line.start_with?("#")