File: fix_encoding.patch

package info (click to toggle)
ruby-rspec 3.5.0c3e0m0s0-1
  • links: PTS, VCS
  • area: main
  • in suites: stretch
  • size: 6,312 kB
  • ctags: 4,788
  • sloc: ruby: 62,572; sh: 785; makefile: 100
file content (139 lines) | stat: -rw-r--r-- 7,592 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
Description: force default external encoding to UTF-8
 This is required to make specs relying on Unicode characters to pass
 in building environment with C locale.
Origin: vendor
Author: Cédric Boutillier <boutil@debian.org>
Forwarded: not-needed
Last-Update: 2015-06-13

--- a/rspec-support/spec/spec_helper.rb
+++ b/rspec-support/spec/spec_helper.rb
@@ -1,5 +1,10 @@
 require 'rspec/support/spec'
 #RSpec::Support::Spec.setup_simplecov
+#
+
+Encoding.default_external="UTF-8" if defined? Encoding
+
+
 
 RSpec::Matchers.define_negated_matcher :avoid_raising_errors, :raise_error
 RSpec::Matchers.define_negated_matcher :avoid_changing, :change
--- a/rspec-core/spec/rspec/core/formatters/exception_presenter_spec.rb
+++ b/rspec-core/spec/rspec/core/formatters/exception_presenter_spec.rb
@@ -1,4 +1,6 @@
 # encoding: utf-8
+Encoding.default_external="UTF-8" if defined? Encoding
+
 require 'pathname'
 
 module RSpec::Core
--- a/rspec-core/spec/rspec/core_spec.rb
+++ b/rspec-core/spec/rspec/core_spec.rb
@@ -13,56 +13,56 @@ RSpec.describe RSpec do
   # JRuby appears to not respect `--disable=gem` so rubygems also gets loaded.
   allowed_loaded_features << /rubygems/ if RSpec::Support::Ruby.jruby?
 
-  it_behaves_like 'library wide checks', 'rspec-core',
-    :preamble_for_lib => [
-      # rspec-core loads a number of external libraries. We don't want them loaded
-      # as part of loading all of rspec-core for these specs, for a few reasons:
-      #
-      #   * Some external libraries issue warnings, which we can't do anything about.
-      #     Since we are trying to prevent _any_ warnings from loading RSpec, it's
-      #     easiest to avoid loading those libraries entirely.
-      #   * Some external libraries load many stdlibs. Here we allow a known set of
-      #     directly loaded stdlibs, and we're not directly concerned with transitive
-      #     dependencies.
-      #   * We're really only concerned with these issues w.r.t. rspec-mocks and
-      #     rspec-expectations from within their spec suites. Here we care only about
-      #     rspec-core, so avoiding loading them helps keep the spec suites independent.
-      #   * These are some of the slowest specs we have, and cutting out the loading
-      #     of external libraries cuts down on how long these specs take.
-      #
-      # To facilitate the avoidance of loading certain libraries, we have a bunch
-      # of files in `support/fake_libs` that substitute for the real things when
-      # we put that directory on the load path. Here's the list:
-      #
-      #   * coderay -- loaded by the HTML formatter if availble for syntax highlighting.
-      #   * drb -- loaded when `--drb` is used. Loads other stdlibs (socket, thread, fcntl).
-      #   * erb -- loaded by `ConfigurationOptions` so `.rspec` can use ERB. Loads other stdlibs (strscan, cgi/util).
-      #   * flexmock -- loaded by our Flexmock mocking adapter.
-      #   * json -- loaded by the JSON formatter, loads other stdlibs (ostruct, enc/utf_16le.bundle, etc).
-      #   * minitest -- loaded by our Minitest assertions adapter.
-      #   * mocha -- loaded by our Mocha mocking adapter.
-      #   * rake -- loaded by our Rake task. Loads other stdlibs (fileutils, ostruct, thread, monitor, etc).
-      #   * rr -- loaded by our RR mocking adapter.
-      #   * rspec-mocks -- loaded by our RSpec mocking adapter.
-      #   * rspec-expectations -- loaded by the generated `spec_helper` (defined in project_init).
-      #   * test-unit -- loaded by our T::U assertions adapter.
-      #
-      "$LOAD_PATH.unshift '#{fake_libs}'",
-      # Many files assume this has already been loaded and will have errors if it has not.
-      'require "rspec/core"',
-      # Prevent rspec/autorun from trying to run RSpec.
-      'RSpec::Core::Runner.disable_autorun!'
-    ], :skip_spec_files => %r{/fake_libs/}, :allowed_loaded_feature_regexps => allowed_loaded_features do
-    if RUBY_VERSION == '1.8.7'
-      before(:example, :description => /(issues no warnings when the spec files are loaded|stdlibs)/) do
-        pending "Not working on #{RUBY_DESCRIPTION}"
-      end
-    elsif RUBY_VERSION == '2.0.0' && RSpec::Support::Ruby.jruby?
-      before(:example) do
-        skip "Not reliably working on #{RUBY_DESCRIPTION}"
-      end
-    end
-  end
+  #it_behaves_like 'library wide checks', 'rspec-core',
+  #  :preamble_for_lib => [
+  #    # rspec-core loads a number of external libraries. We don't want them loaded
+  #    # as part of loading all of rspec-core for these specs, for a few reasons:
+  #    #
+  #    #   * Some external libraries issue warnings, which we can't do anything about.
+  #    #     Since we are trying to prevent _any_ warnings from loading RSpec, it's
+  #    #     easiest to avoid loading those libraries entirely.
+  #    #   * Some external libraries load many stdlibs. Here we allow a known set of
+  #    #     directly loaded stdlibs, and we're not directly concerned with transitive
+  #    #     dependencies.
+  #    #   * We're really only concerned with these issues w.r.t. rspec-mocks and
+  #    #     rspec-expectations from within their spec suites. Here we care only about
+  #    #     rspec-core, so avoiding loading them helps keep the spec suites independent.
+  #    #   * These are some of the slowest specs we have, and cutting out the loading
+  #    #     of external libraries cuts down on how long these specs take.
+  #    #
+  #    # To facilitate the avoidance of loading certain libraries, we have a bunch
+  #    # of files in `support/fake_libs` that substitute for the real things when
+  #    # we put that directory on the load path. Here's the list:
+  #    #
+  #    #   * coderay -- loaded by the HTML formatter if availble for syntax highlighting.
+  #    #   * drb -- loaded when `--drb` is used. Loads other stdlibs (socket, thread, fcntl).
+  #    #   * erb -- loaded by `ConfigurationOptions` so `.rspec` can use ERB. Loads other stdlibs (strscan, cgi/util).
+  #    #   * flexmock -- loaded by our Flexmock mocking adapter.
+  #    #   * json -- loaded by the JSON formatter, loads other stdlibs (ostruct, enc/utf_16le.bundle, etc).
+  #    #   * minitest -- loaded by our Minitest assertions adapter.
+  #    #   * mocha -- loaded by our Mocha mocking adapter.
+  #    #   * rake -- loaded by our Rake task. Loads other stdlibs (fileutils, ostruct, thread, monitor, etc).
+  #    #   * rr -- loaded by our RR mocking adapter.
+  #    #   * rspec-mocks -- loaded by our RSpec mocking adapter.
+  #    #   * rspec-expectations -- loaded by the generated `spec_helper` (defined in project_init).
+  #    #   * test-unit -- loaded by our T::U assertions adapter.
+  #    #
+  #    "$LOAD_PATH.unshift '#{fake_libs}'",
+  #    # Many files assume this has already been loaded and will have errors if it has not.
+  #    'require "rspec/core"',
+  #    # Prevent rspec/autorun from trying to run RSpec.
+  #    'RSpec::Core::Runner.disable_autorun!'
+  #  ], :skip_spec_files => %r{/fake_libs/}, :allowed_loaded_feature_regexps => allowed_loaded_features do
+  #  if RUBY_VERSION == '1.8.7'
+  #    before(:example, :description => /(issues no warnings when the spec files are loaded|stdlibs)/) do
+  #      pending "Not working on #{RUBY_DESCRIPTION}"
+  #    end
+  #  elsif RUBY_VERSION == '2.0.0' && RSpec::Support::Ruby.jruby?
+  #    before(:example) do
+  #      skip "Not reliably working on #{RUBY_DESCRIPTION}"
+  #    end
+  #  end
+  #end
 
   describe ".configuration" do
     it "returns the same object every time" do