Merge pull request #329 from ysksn/spec_helper
Remove $LOAD_PATH.unshift(*) and $LOAD_PATH.uniq! from spec/spec_helper.rb because they do nothing
This commit is contained in:
commit
d9056b3c77
|
@ -9,7 +9,7 @@ env:
|
||||||
- RAILS_VERSION="~>4.0.0"
|
- RAILS_VERSION="~>4.0.0"
|
||||||
- RAILS_VERSION="~>4.1.0"
|
- RAILS_VERSION="~>4.1.0"
|
||||||
- RAILS_VERSION="~>4.2.0"
|
- RAILS_VERSION="~>4.2.0"
|
||||||
script: "rake spec:all"
|
script: "bundle exec rake spec:all"
|
||||||
before_install:
|
before_install:
|
||||||
- sudo apt-get update
|
- sudo apt-get update
|
||||||
- sudo apt-get install idn
|
- sudo apt-get install idn
|
||||||
|
|
|
@ -19,13 +19,8 @@ GENERATED_DIR = File.expand_path(File.join(ROOT_DIR, 'generated'))
|
||||||
THIRD_PARTY_DIR = File.expand_path(File.join(ROOT_DIR, 'third_party'))
|
THIRD_PARTY_DIR = File.expand_path(File.join(ROOT_DIR, 'third_party'))
|
||||||
FIXTURES_DIR = File.expand_path(File.join(SPEC_DIR, 'fixtures'))
|
FIXTURES_DIR = File.expand_path(File.join(SPEC_DIR, 'fixtures'))
|
||||||
|
|
||||||
$LOAD_PATH.unshift(SPEC_DIR)
|
|
||||||
$LOAD_PATH.unshift(LIB_DIR)
|
|
||||||
$LOAD_PATH.unshift(GENERATED_DIR)
|
|
||||||
$LOAD_PATH.unshift(THIRD_PARTY_DIR)
|
|
||||||
$LOAD_PATH.uniq!
|
$LOAD_PATH.uniq!
|
||||||
|
|
||||||
|
|
||||||
if defined?(JRUBY_VERSION)
|
if defined?(JRUBY_VERSION)
|
||||||
puts 'Skipping coverage on JRuby'
|
puts 'Skipping coverage on JRuby'
|
||||||
else
|
else
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
# Copyright 2015 Google Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
|
||||||
|
require 'spec_helper'
|
||||||
|
|
||||||
|
RSpec.describe $LOAD_PATH do
|
||||||
|
it('should contain SPEC_DIR') do
|
||||||
|
expect($LOAD_PATH).to include(SPEC_DIR)
|
||||||
|
end
|
||||||
|
|
||||||
|
it('should contain LIB_DIR') do
|
||||||
|
expect($LOAD_PATH).to include(LIB_DIR)
|
||||||
|
end
|
||||||
|
|
||||||
|
it('should contain GENERATED_DIR') do
|
||||||
|
expect($LOAD_PATH).to include(GENERATED_DIR)
|
||||||
|
end
|
||||||
|
|
||||||
|
it('should contain THIRD_PARTY_DIR') do
|
||||||
|
expect($LOAD_PATH).to include(THIRD_PARTY_DIR)
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in New Issue