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

Updates from rspec-dev (2018-12-21) #2585

Merged
merged 2 commits into from
Dec 21, 2018
Merged

Updates from rspec-dev (2018-12-21) #2585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
861a037
Updated travis build scripts (from rspec-dev)
JonRowe Dec 21, 2018
cfbbe75
Skip broken spec on windows
JonRowe Dec 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .rubocop_rspec_base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2018-11-17T09:39:13+01:00 from the rspec-dev repo.
# This file was generated on 2018-12-21T13:15:31+00:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

# This file contains defaults for RSpec projects. Individual projects
Expand Down
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2018-11-17T09:39:13+01:00 from the rspec-dev repo.
# This file was generated on 2018-12-21T13:15:31+00:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

language: ruby
Expand All @@ -8,7 +8,8 @@ cache:
directories:
- ../bundle
before_install:
- gem update --system # https://github.com/travis-ci/travis-ci/issues/8978#issuecomment-354036443
# We need to ensure the latest version of Rubygems, unless we're on an old Ruby.
- gem update --system $(ruby -e "puts '2.7.8' if ENV['RUBY_VERSION'] >= '2.3.0'")
- gem install bundler
- unset _JAVA_OPTIONS
- "script/clone_all_rspec_repos"
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2018-11-17T09:39:13+01:00 from the rspec-dev repo.
# This file was generated on 2018-12-21T13:15:31+00:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

version: "{build}"
Expand Down Expand Up @@ -29,7 +29,7 @@ before_test:
- bundle --version

test_script:
- chcp 65001 && bundle exec rspec --backtrace
- bundle exec rspec --backtrace

environment:
matrix:
Expand Down
2 changes: 1 addition & 1 deletion script/clone_all_rspec_repos
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2018-11-17T09:39:13+01:00 from the rspec-dev repo.
# This file was generated on 2018-12-21T13:15:31+00:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

set -e
Expand Down
2 changes: 1 addition & 1 deletion script/functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2018-11-17T09:39:13+01:00 from the rspec-dev repo.
# This file was generated on 2018-12-21T13:15:31+00:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
Expand Down
2 changes: 1 addition & 1 deletion script/predicate_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2018-11-17T09:39:13+01:00 from the rspec-dev repo.
# This file was generated on 2018-12-21T13:15:31+00:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

function is_mri {
Expand Down
2 changes: 1 addition & 1 deletion script/run_build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2018-11-17T09:39:13+01:00 from the rspec-dev repo.
# This file was generated on 2018-12-21T13:15:31+00:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

set -e
Expand Down
2 changes: 1 addition & 1 deletion script/travis_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2018-11-17T09:39:13+01:00 from the rspec-dev repo.
# This file was generated on 2018-12-21T13:15:31+00:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

# Taken from:
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/core/formatters/exception_presenter_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ module RSpec::Core
EOS
end

if String.method_defined?(:encoding)
if String.method_defined?(:encoding) && !RSpec::Support::OS.windows?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was failing?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not your fault, Windows seems to be flakey on this

it 'allows the caller to add encoded description' do
the_presenter = Formatters::ExceptionPresenter.new(exception, example,
:description => "ジ".encode("CP932"))
Expand Down