Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Commit 726821d

Browse files
authored
Updates from rspec-dev (2018-12-21) (#2585)
* Updated travis build scripts (from rspec-dev) * Skip broken spec on windows
1 parent 595747f commit 726821d

9 files changed

+12
-11
lines changed

.rubocop_rspec_base.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-11-17T09:39:13+01:00 from the rspec-dev repo.
1+
# This file was generated on 2018-12-21T13:15:31+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
# This file contains defaults for RSpec projects. Individual projects

.travis.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-11-17T09:39:13+01:00 from the rspec-dev repo.
1+
# This file was generated on 2018-12-21T13:15:31+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
language: ruby
@@ -8,7 +8,8 @@ cache:
88
directories:
99
- ../bundle
1010
before_install:
11-
- gem update --system # https://github.com/travis-ci/travis-ci/issues/8978#issuecomment-354036443
11+
# We need to ensure the latest version of Rubygems, unless we're on an old Ruby.
12+
- gem update --system $(ruby -e "puts '2.7.8' if ENV['RUBY_VERSION'] >= '2.3.0'")
1213
- gem install bundler
1314
- unset _JAVA_OPTIONS
1415
- "script/clone_all_rspec_repos"

appveyor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-11-17T09:39:13+01:00 from the rspec-dev repo.
1+
# This file was generated on 2018-12-21T13:15:31+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
version: "{build}"
@@ -29,7 +29,7 @@ before_test:
2929
- bundle --version
3030

3131
test_script:
32-
- chcp 65001 && bundle exec rspec --backtrace
32+
- bundle exec rspec --backtrace
3333

3434
environment:
3535
matrix:

script/clone_all_rspec_repos

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2018-11-17T09:39:13+01:00 from the rspec-dev repo.
2+
# This file was generated on 2018-12-21T13:15:31+00:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

script/functions.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-11-17T09:39:13+01:00 from the rspec-dev repo.
1+
# This file was generated on 2018-12-21T13:15:31+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

script/predicate_functions.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-11-17T09:39:13+01:00 from the rspec-dev repo.
1+
# This file was generated on 2018-12-21T13:15:31+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
function is_mri {

script/run_build

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2018-11-17T09:39:13+01:00 from the rspec-dev repo.
2+
# This file was generated on 2018-12-21T13:15:31+00:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

script/travis_functions.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2018-11-17T09:39:13+01:00 from the rspec-dev repo.
1+
# This file was generated on 2018-12-21T13:15:31+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
# Taken from:

spec/rspec/core/formatters/exception_presenter_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ module RSpec::Core
9494
EOS
9595
end
9696

97-
if String.method_defined?(:encoding)
97+
if String.method_defined?(:encoding) && !RSpec::Support::OS.windows?
9898
it 'allows the caller to add encoded description' do
9999
the_presenter = Formatters::ExceptionPresenter.new(exception, example,
100100
:description => "ジ".encode("CP932"))

0 commit comments

Comments
 (0)