diff options
author | Tim Smith <tsmith@chef.io> | 2018-01-18 12:01:44 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-18 12:01:44 -0800 |
commit | 083ab943462e5b14503a67cfecd6b16e6d6be0ef (patch) | |
tree | 11b7efd434264b87c2634fadee8fd7aec5788955 | |
parent | 805b26bba37356c1f62518c950e54ab610920a54 (diff) | |
parent | ab202d708839ad58a85b0dff8b5108b1cd890459 (diff) | |
download | chef-083ab943462e5b14503a67cfecd6b16e6d6be0ef.tar.gz |
Merge pull request #6715 from chef/travis_25
Add Ruby 2.5 testing to Travis
-rw-r--r-- | .travis.yml | 20 | ||||
-rw-r--r-- | spec/unit/chef_fs/file_system/repository/directory_spec.rb | 4 | ||||
-rw-r--r-- | spec/unit/deprecated_spec.rb | 8 |
3 files changed, 26 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index b68193644c..2b3b582694 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,12 @@ matrix: script: sudo -E $(which bundle) exec rake spec:integration; bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - env: + INTEGRATION_SPECS_25: 1 + rvm: 2.5.0 + sudo: true + script: sudo -E $(which bundle) exec rake spec:integration; + bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen + - env: FUNCTIONAL_SPECS_23: 1 rvm: 2.3.5 sudo: true @@ -55,6 +61,12 @@ matrix: script: sudo -E $(which bundle) exec rake spec:functional; bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - env: + FUNCTIONAL_SPECS_25: 1 + rvm: 2.5.0 + sudo: true + script: sudo -E $(which bundle) exec rake spec:functional; + bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen + - env: UNIT_SPECS_23: 1 rvm: 2.3.5 sudo: true @@ -71,6 +83,14 @@ matrix: - sudo -E $(which bundle) exec rake component_specs bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - env: + UNIT_SPECS_25: 1 + rvm: 2.5.0 + sudo: true + script: + - sudo -E $(which bundle) exec rake spec:unit; + - sudo -E $(which bundle) exec rake component_specs + bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen + - env: CHEFSTYLE: 1 rvm: 2.4.3 script: bundle exec rake style diff --git a/spec/unit/chef_fs/file_system/repository/directory_spec.rb b/spec/unit/chef_fs/file_system/repository/directory_spec.rb index 6e53e52966..e44cc15167 100644 --- a/spec/unit/chef_fs/file_system/repository/directory_spec.rb +++ b/spec/unit/chef_fs/file_system/repository/directory_spec.rb @@ -1,6 +1,6 @@ # # Author:: Thom May (<thom@chef.io>) -# Copyright:: Copyright 2012-2016, Chef Software Inc. +# Copyright:: Copyright 2012-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -152,7 +152,7 @@ describe Chef::ChefFS::FileSystem::Repository::Directory do end after do - FileUtils.rmdir(tmp_dir) + FileUtils.rm_rf(tmp_dir) end end diff --git a/spec/unit/deprecated_spec.rb b/spec/unit/deprecated_spec.rb index 9be792ab20..4eba764b63 100644 --- a/spec/unit/deprecated_spec.rb +++ b/spec/unit/deprecated_spec.rb @@ -1,5 +1,5 @@ # -# Copyright:: Copyright 2013-2016, Chef Software Inc. +# Copyright:: Copyright 2013-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -29,7 +29,7 @@ describe Chef::Deprecated do context "loading a deprecation class" do it "loads the correct class" do - expect(Chef::Deprecated.create(:test_deprecation)).to be_an_instance_of(Chef::Deprecated::TestDeprecation) + expect(Chef::Deprecated.create(:test_deprecation)).to be_an_instance_of(TestDeprecation) end it "optionally sets a message" do @@ -49,11 +49,11 @@ describe Chef::Deprecated do let(:location) { "the location" } it "displays the full URL" do - expect(Chef::Deprecated::TestDeprecation.new().url).to eql("#{base_url}test.html") + expect(TestDeprecation.new().url).to eql("#{base_url}test.html") end it "formats a complete deprecation message" do - expect(Chef::Deprecated::TestDeprecation.new(message, location).inspect).to eql("#{message} (CHEF-999)#{location}.\nhttps://docs.chef.io/deprecations_test.html") + expect(TestDeprecation.new(message, location).inspect).to eql("#{message} (CHEF-999)#{location}.\nhttps://docs.chef.io/deprecations_test.html") end end end |