File tree Expand file tree Collapse file tree 4 files changed +13
-3
lines changed Expand file tree Collapse file tree 4 files changed +13
-3
lines changed Original file line number Diff line number Diff line change @@ -286,7 +286,7 @@ namespace :travis do
286
286
287
287
each_project_with_common_travis_build do |name |
288
288
unless system ( "git push origin #{ branch } " )
289
- puts "Push failed, force?"
289
+ puts "Push failed, force? (y/n) "
290
290
if STDIN . gets . downcase =~ /^y/
291
291
sh "git push origin +#{ branch } "
292
292
end
Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ if is_mri; then
9
9
clone_repo " rspec-core"
10
10
clone_repo " rspec-expectations"
11
11
clone_repo " rspec-mocks"
12
+ clone_repo " rspec-rails"
12
13
13
14
if rspec_support_compatible; then
14
15
clone_repo " rspec-support"
Original file line number Diff line number Diff line change 2
2
export JRUBY_OPTS=' -X-C' # disable JIT since these processes are so short lived
3
3
SPECS_HAVE_RUN_FILE=specs.out
4
4
MAINTENANCE_BRANCH=` cat maintenance-branch`
5
- BUNDLE_INSTALL_FLAGS=` cat .travis.yml | grep bundler_args | tr -d ' "' | grep -o " .*" `
6
5
7
6
# Taken from:
8
7
# https://github.com/travis-ci/travis-build/blob/e9314616e182a23e6a280199cd9070bfc7cae548/lib/travis/build/script/templates/header.sh#L34-L53
@@ -49,6 +48,12 @@ function is_mri_192 {
49
48
fi
50
49
}
51
50
51
+ function set_rails_version_for_rspec_rails {
52
+ if ruby -e " exit(RUBY_VERSION < '1.9.3')" ; then
53
+ export RAILS_VERSION=3.2.17
54
+ fi
55
+ }
56
+
52
57
function rspec_support_compatible {
53
58
if [ " $MAINTENANCE_BRANCH " != " 2-99-maintenance" ] && [ " $MAINTENANCE_BRANCH " != " 2-14-maintenance" ]; then
54
59
return 0
@@ -120,7 +125,8 @@ function run_spec_suite_for {
120
125
echo " Running specs for $1 "
121
126
echo
122
127
unset BUNDLE_GEMFILE
123
- travis_retry bundle install $BUNDLE_INSTALL_FLAGS
128
+ bundle_install_flags=` cat .travis.yml | grep bundler_args | tr -d ' "' | grep -o " .*" `
129
+ travis_retry bundle install $bundle_install_flags
124
130
run_specs_and_record_done
125
131
popd
126
132
fi ;
Original file line number Diff line number Diff line change @@ -15,6 +15,9 @@ if is_mri; then
15
15
run_spec_suite_for " rspec-expectations"
16
16
run_spec_suite_for " rspec-mocks"
17
17
18
+ set_rails_version_for_rspec_rails
19
+ run_spec_suite_for " rspec-rails"
20
+
18
21
if rspec_support_compatible; then
19
22
run_spec_suite_for " rspec-support"
20
23
fi
You can’t perform that action at this time.
0 commit comments