Skip to content

Commit

Permalink
Merge pull request #40 from jekyll/rspec-3
Browse files Browse the repository at this point in the history
  • Loading branch information
parkr committed Nov 12, 2014
2 parents 6f55b51 + eaceb4d commit 9d2ac36
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ language: ruby
rvm:
- 1.9.3
- 2.0.0
- 2.1.0
- 2.1
sudo: false
cache: bundler
before_script: bundle update
script: "./script/cibuild"
notifications:
email:
Expand Down
2 changes: 1 addition & 1 deletion mercenary.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ Gem::Specification.new do |spec|

spec.add_development_dependency "bundler", "~> 1.3"
spec.add_development_dependency "rake"
spec.add_development_dependency "rspec", "~> 2.14"
spec.add_development_dependency "rspec", "~> 3.0"
end
6 changes: 3 additions & 3 deletions spec/option_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

it "compares itself with other options well" do
new_option = described_class.new(config_key, ['-l', '--largo', description])
expect(option.eql?(new_option)).to be_true
expect(option.hash.eql?(new_option.hash)).to be_true
expect(option.eql?(new_option)).to be(true)
expect(option.hash.eql?(new_option.hash)).to be(true)
end

it "has a custom #hash" do
Expand Down Expand Up @@ -72,7 +72,7 @@
let(:description) { nil }

it "knows there is no description" do
expect(option.description).to be_nil
expect(option.description).to be(nil)
end

it "knows both inputs are switches" do
Expand Down
1 change: 0 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
require 'mercenary'

RSpec.configure do |config|
config.treat_symbols_as_metadata_keys_with_true_values = true
config.run_all_when_everything_filtered = true
config.filter_run :focus

Expand Down

0 comments on commit 9d2ac36

Please sign in to comment.