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

Commit 142fb3c

Browse files
committed
Updates from rspec-dev that were missed
1 parent 97ea7a0 commit 142fb3c

9 files changed

+37
-21
lines changed

.github/FUNDING.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# This file was generated on 2019-12-05T21:32:24+00:00 from the rspec-dev repo.
2+
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
3+
4+
github: [JonRowe]
5+
open_collective: rspec

BUILD_DETAIL.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!---
2-
This file was generated on 2018-04-17T19:41:57+02:00 from the rspec-dev repo.
2+
This file was generated on 2019-12-05T21:32:24+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

@@ -68,8 +68,8 @@ $ bin/cucumber
6868

6969
## YARD documentation
7070

71-
RSpec uses [YARD](http://yardoc.org/) for API documentation on the [rspec.info site](http://rspec.info/).
72-
Our commitment to [SemVer](htp://semver.org) requires that we explicitly
71+
RSpec uses [YARD](https://yardoc.org/) for API documentation on the [rspec.info site](https://rspec.info/).
72+
Our commitment to [SemVer](https://semver.org) requires that we explicitly
7373
declare our public API, and our build uses YARD to ensure that every
7474
class, module and method has either been labeled `@private` or has at
7575
least some level of documentation. For new APIs, this forces us to make

CODE_OF_CONDUCT.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!---
2-
This file was generated on 2018-04-17T19:41:57+02:00 from the rspec-dev repo.
2+
This file was generated on 2019-12-05T21:32:24+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

@@ -46,14 +46,14 @@ when an individual is representing the project or its community.
4646

4747
Instances of abusive, harassing, or otherwise unacceptable behavior may be
4848
reported by contacting one of the project maintainers listed at
49-
http://rspec.info/about/. All complaints will be reviewed and investigated
49+
https://rspec.info/about/. All complaints will be reviewed and investigated
5050
and will result in a response that is deemed necessary and appropriate to the
5151
circumstances. Maintainers are obligated to maintain confidentiality with
5252
regard to the reporter of an incident.
5353

5454
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
5555
version 1.3.0, available at
56-
[http://contributor-covenant.org/version/1/3/0/][version]
56+
[https://contributor-covenant.org/version/1/3/0/][version]
5757

58-
[homepage]: http://contributor-covenant.org
59-
[version]: http://contributor-covenant.org/version/1/3/0/
58+
[homepage]: https://contributor-covenant.org
59+
[version]: https://contributor-covenant.org/version/1/3/0/

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!---
2-
This file was generated on 2018-04-17T19:41:57+02:00 from the rspec-dev repo.
2+
This file was generated on 2019-12-05T21:32:24+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

@@ -13,8 +13,8 @@ If you'd like to help make RSpec better, here are some ways you can contribute:
1313
- by running RSpec HEAD to help us catch bugs before new releases
1414
- by [reporting bugs you encounter](https://github.com/rspec/rspec-support/issues/new) with [report template](#report-template)
1515
- by [suggesting new features](https://github.com/rspec/rspec-support/issues/new)
16-
- by improving RSpec's [Relish](https://relishapp.com/rspec) or [API](http://rspec.info/documentation/) documentation
17-
- by improving [RSpec's website](http://rspec.info/) ([source](https://github.com/rspec/rspec.github.io))
16+
- by improving RSpec's [Relish](https://relishapp.com/rspec) or [API](https://rspec.info/documentation/) documentation
17+
- by improving [RSpec's website](https://rspec.info/) ([source](https://github.com/rspec/rspec.github.io))
1818
- by taking part in [feature and issue discussions](https://github.com/rspec/rspec-support/issues)
1919
- by adding a failing test for reproducible [reported bugs](https://github.com/rspec/rspec-support/issues)
2020
- by reviewing [pull requests](https://github.com/rspec/rspec-support/pulls) and suggesting improvements

DEVELOPMENT.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<!---
2-
This file was generated on 2018-04-17T19:41:57+02:00 from the rspec-dev repo.
2+
This file was generated on 2019-12-05T21:32:24+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

66
# Development Setup
77

88
Generally speaking, you only need to clone the project and install
9-
the dependencies with [Bundler](http://bundler.io/). You can either
9+
the dependencies with [Bundler](https://bundler.io/). You can either
1010
get a full RSpec development environment using
1111
[rspec-dev](https://github.com/rspec/rspec-dev#README) or you can
1212
set this project up individually.
@@ -22,7 +22,7 @@ Clone the repo:
2222
$ git clone [email protected]:rspec/rspec-support.git
2323
```
2424

25-
Install the dependencies using [Bundler](http://bundler.io/):
25+
Install the dependencies using [Bundler](https://bundler.io/):
2626

2727
```
2828
$ cd rspec-support
@@ -31,7 +31,7 @@ $ bundle install
3131

3232
To minimize boot time and to ensure we don't depend upon any extra dependencies
3333
loaded by Bundler, our CI builds avoid loading Bundler at runtime
34-
by using Bundler's [`--standalone option`](http://myronmars.to/n/dev-blog/2012/03/faster-test-boot-times-with-bundler-standalone).
34+
by using Bundler's [`--standalone option`](https://myronmars.to/n/dev-blog/2012/03/faster-test-boot-times-with-bundler-standalone).
3535
While not strictly necessary (many/most of our contributors do not do this!),
3636
if you want to exactly reproduce our CI builds you'll want to do the same:
3737

@@ -114,7 +114,7 @@ Here's a short, non-exhaustive checklist of things we typically ask contributors
114114

115115
# Adding Docs
116116

117-
RSpec uses [YARD](http://yardoc.org/) for its API documentation. To
117+
RSpec uses [YARD](https://yardoc.org/) for its API documentation. To
118118
ensure the docs render well, we recommend running a YARD server and
119119
viewing your edits in a browser.
120120

REPORT_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!---
2-
This file was generated on 2018-04-17T19:41:57+02:00 from the rspec-dev repo.
2+
This file was generated on 2019-12-05T21:32:24+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

script/functions.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ source $SCRIPT_DIR/travis_functions.sh
66
source $SCRIPT_DIR/predicate_functions.sh
77

88
# If JRUBY_OPTS isn't set, use these.
9-
# see http://docs.travis-ci.com/user/ci-environment/
9+
# see https://docs.travis-ci.com/user/ci-environment/
1010
export JRUBY_OPTS=${JRUBY_OPTS:-"--server -Xcompile.invokedynamic=false"}
1111
SPECS_HAVE_RUN_FILE=specs.out
1212
MAINTENANCE_BRANCH=`cat maintenance-branch`
@@ -187,7 +187,10 @@ function run_all_spec_suites {
187187
fold "rspec-core specs" run_spec_suite_for "rspec-core"
188188
fold "rspec-expectations specs" run_spec_suite_for "rspec-expectations"
189189
fold "rspec-mocks specs" run_spec_suite_for "rspec-mocks"
190-
fold "rspec-rails specs" run_spec_suite_for "rspec-rails"
190+
191+
if rspec_rails_compatible; then
192+
fold "rspec-rails specs" run_spec_suite_for "rspec-rails"
193+
fi
191194

192195
if rspec_support_compatible; then
193196
fold "rspec-support specs" run_spec_suite_for "rspec-support"

script/predicate_functions.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@ function is_ruby_23_plus {
6565
fi
6666
}
6767

68+
function rspec_rails_compatible {
69+
if is_ruby_23_plus; then
70+
return 0
71+
else
72+
return 1
73+
fi
74+
}
75+
6876
function rspec_support_compatible {
6977
if [ "$MAINTENANCE_BRANCH" != "2-99-maintenance" ] && [ "$MAINTENANCE_BRANCH" != "2-14-maintenance" ]; then
7078
return 0

script/update_rubygems_and_install_bundler

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ set -e
66
source script/functions.sh
77

88
if is_ruby_23_plus; then
9-
gem update --system
10-
gem install bundler
9+
yes | gem update --system
10+
yes | gem install bundler
1111
else
1212
echo "Warning installing older versions of Rubygems / Bundler"
1313
gem update --system '2.7.8'

0 commit comments

Comments
 (0)