Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CI build config #10

Merged
merged 5 commits into from
Feb 11, 2019
Merged

Fix CI build config #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07206d5
Update CI config to run under Ruby 2.3.6
schlick Feb 11, 2019
3d59323
Remove Gemfile.lock
schlick Feb 11, 2019
dd751d8
Remove codeclimate-test-reporter
schlick Feb 11, 2019
8f2bfe1
Fix RSpec deprecations about be_true and be_false
schlick Feb 11, 2019
1286ed0
Switch to factory_bot
schlick Feb 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source "https://rubygems.org"
gemspec

gem "codeclimate-test-reporter", group: :test, require: nil
gem "simplecov", group: :test, require: nil
67 changes: 0 additions & 67 deletions Gemfile.lock
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion boolean_dsl.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Gem::Specification.new do |s|

s.add_development_dependency 'bundler', '~> 1.0'
s.add_development_dependency 'rspec', '~> 2.14'
s.add_development_dependency 'factory_girl', '~> 4.4'
s.add_development_dependency 'factory_bot', '~> 4.4'
s.add_development_dependency 'cane', '~> 2.6'
s.add_development_dependency 'byebug', '~> 2.7'
s.add_development_dependency 'rake', '~> 10.1'
Expand Down
2 changes: 1 addition & 1 deletion scripts/buildbox.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -e

echo '--- setting ruby version'
rbenv local 2.1.2
rbenv local 2.3.6

echo '--- bundling'
bundle install -j $(nproc) --without production --quiet
Expand Down
6 changes: 3 additions & 3 deletions spec/evaluator/context_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
context 'attribute' do
specify { expect(evaluator.evaluate(attribute: 'alpha')).to eq('omega') }
specify { expect(evaluator.evaluate(attribute: 'gamma')).to eq(7) }
specify { expect(evaluator.evaluate(attribute: 'delta')).to be_true }
specify { expect(evaluator.evaluate(attribute: 'yotta')).to be_false }
specify { expect(evaluator.evaluate(attribute: 'delta')).to be_truthy }
specify { expect(evaluator.evaluate(attribute: 'yotta')).to be_falsey }
specify do
expect { evaluator.evaluate(attribute: 'beta') }.to(
raise_error(BooleanDsl::EvaluationFailed, 'Context does not have key beta'))
Expand Down Expand Up @@ -55,4 +55,4 @@
)
end
end
end
end
18 changes: 9 additions & 9 deletions spec/evaluator/evaluate_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
left: { integer: '1' },
comparison_operator: '==',
right: { integer: '1' },
)).to be_true
)).to be_truthy
end

specify do
expect(evaluator.evaluate(
left: { integer: '1' },
comparison_operator: '<',
right: { integer: '1' },
)).to be_false
)).to be_falsey
end

specify do
Expand All @@ -35,7 +35,7 @@
comparison_operator: '==',
right: { integer: '1' },
}
)).to be_true
)).to be_truthy
end

specify do
Expand All @@ -51,7 +51,7 @@
comparison_operator: '==',
right: { integer: '1' },
}
)).to be_false
)).to be_falsey
end

specify do
Expand All @@ -67,7 +67,7 @@
comparison_operator: '==',
right: { integer: '1' },
}
)).to be_true
)).to be_truthy
end

specify do
Expand All @@ -83,7 +83,7 @@
comparison_operator: '==',
right: { integer: '2' },
}
)).to be_false
)).to be_falsey
end

specify do
Expand All @@ -93,6 +93,6 @@
comparison_operator: '!=',
right: { integer: '1' }
}
)).to be_false
)).to be_falsey
end
end
end
62 changes: 31 additions & 31 deletions spec/evaluator_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
context '#evaluate_comparison' do
let(:evaluator) { described_class.new(nil, nil) }

specify { expect(evaluator.evaluate_comparison(1, '==', 1)).to be_true }
specify { expect(evaluator.evaluate_comparison(1, '==', 0)).to be_false }
specify { expect(evaluator.evaluate_comparison(1, '!=', 1)).to be_false }
specify { expect(evaluator.evaluate_comparison(1, '!=', 0)).to be_true }

specify { expect(evaluator.evaluate_comparison('alpha', '==', 'alpha')).to be_true }
specify { expect(evaluator.evaluate_comparison('beta', '==', 'omega')).to be_false }
specify { expect(evaluator.evaluate_comparison('alpha', '!=', 'alpha')).to be_false }
specify { expect(evaluator.evaluate_comparison('beta', '!=', 'omega')).to be_true }

specify { expect(evaluator.evaluate_comparison(10, '<', 20)).to be_true }
specify { expect(evaluator.evaluate_comparison(20, '<', 10)).to be_false }
specify { expect(evaluator.evaluate_comparison(20, '>', 10)).to be_true }
specify { expect(evaluator.evaluate_comparison(10, '>', 20)).to be_false }
specify { expect(evaluator.evaluate_comparison(20, '<=', 20)).to be_true }
specify { expect(evaluator.evaluate_comparison(20, '>=', 20)).to be_true }
specify { expect(evaluator.evaluate_comparison(1, '==', 1)).to be_truthy }
specify { expect(evaluator.evaluate_comparison(1, '==', 0)).to be_falsey }
specify { expect(evaluator.evaluate_comparison(1, '!=', 1)).to be_falsey }
specify { expect(evaluator.evaluate_comparison(1, '!=', 0)).to be_truthy }

specify { expect(evaluator.evaluate_comparison('alpha', '==', 'alpha')).to be_truthy }
specify { expect(evaluator.evaluate_comparison('beta', '==', 'omega')).to be_falsey }
specify { expect(evaluator.evaluate_comparison('alpha', '!=', 'alpha')).to be_falsey }
specify { expect(evaluator.evaluate_comparison('beta', '!=', 'omega')).to be_truthy }

specify { expect(evaluator.evaluate_comparison(10, '<', 20)).to be_truthy }
specify { expect(evaluator.evaluate_comparison(20, '<', 10)).to be_falsey }
specify { expect(evaluator.evaluate_comparison(20, '>', 10)).to be_truthy }
specify { expect(evaluator.evaluate_comparison(10, '>', 20)).to be_falsey }
specify { expect(evaluator.evaluate_comparison(20, '<=', 20)).to be_truthy }
specify { expect(evaluator.evaluate_comparison(20, '>=', 20)).to be_truthy }
end

context '#evaluate_boolean' do
Expand All @@ -30,28 +30,28 @@
allow(evaluator).to receive(:evaluate).with(false).and_return(false)
end

specify { expect(evaluator.evaluate_boolean(true, 'and', true)).to be_true }
specify { expect(evaluator.evaluate_boolean(true, 'and', false)).to be_false }
specify { expect(evaluator.evaluate_boolean(false, 'and', true)).to be_false }
specify { expect(evaluator.evaluate_boolean(false, 'and', false)).to be_false }
specify { expect(evaluator.evaluate_boolean(true, 'and', true)).to be_truthy }
specify { expect(evaluator.evaluate_boolean(true, 'and', false)).to be_falsey }
specify { expect(evaluator.evaluate_boolean(false, 'and', true)).to be_falsey }
specify { expect(evaluator.evaluate_boolean(false, 'and', false)).to be_falsey }

specify { expect(evaluator.evaluate_boolean(true, 'or', true)).to be_true }
specify { expect(evaluator.evaluate_boolean(true, 'or', false)).to be_true }
specify { expect(evaluator.evaluate_boolean(false, 'or', true)).to be_true }
specify { expect(evaluator.evaluate_boolean(false, 'or', false)).to be_false }
specify { expect(evaluator.evaluate_boolean(true, 'or', true)).to be_truthy }
specify { expect(evaluator.evaluate_boolean(true, 'or', false)).to be_truthy }
specify { expect(evaluator.evaluate_boolean(false, 'or', true)).to be_truthy }
specify { expect(evaluator.evaluate_boolean(false, 'or', false)).to be_falsey }
end

context 'full parse' do
def outcome_for(expression, context_hash = {})
described_class.new(expression, context_hash).outcome
end
specify { expect(outcome_for('1 == 1')).to be_true }
specify { expect(outcome_for('1 == 0')).to be_false }
specify { expect(outcome_for("(1 < 4 or 5 < 4) and (1 == 1 and 'alpha' == 'alpha')")).to be_true }
specify { expect(outcome_for('gamma == 7', { 'gamma' => 7 })).to be_true }
specify { expect(outcome_for('gamma == 8', { 'gamma' => 7 })).to be_false }
specify { expect(outcome_for("alpha == 'beta'", { 'alpha' => 'beta' })).to be_true }
specify { expect(outcome_for("alpha == 'beta'", { 'alpha' => 'delta' })).to be_false }
specify { expect(outcome_for('1 == 1')).to be_truthy }
specify { expect(outcome_for('1 == 0')).to be_falsey }
specify { expect(outcome_for("(1 < 4 or 5 < 4) and (1 == 1 and 'alpha' == 'alpha')")).to be_truthy }
specify { expect(outcome_for('gamma == 7', { 'gamma' => 7 })).to be_truthy }
specify { expect(outcome_for('gamma == 8', { 'gamma' => 7 })).to be_falsey }
specify { expect(outcome_for("alpha == 'beta'", { 'alpha' => 'beta' })).to be_truthy }
specify { expect(outcome_for("alpha == 'beta'", { 'alpha' => 'delta' })).to be_falsey }
end
end

5 changes: 1 addition & 4 deletions spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
require 'simplecov'
SimpleCov.start

require "codeclimate-test-reporter"
CodeClimate::TestReporter.start

SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
SimpleCov::Formatter::HTMLFormatter
]
Expand All @@ -21,7 +18,7 @@
config.filter_run :focus
config.filter_run_excluding perf: true
config.order = 'random'
# config.include FactoryGirl::Syntax::Methods
# config.include FactoryBot::Syntax::Methods
end

require 'parslet/convenience'
Expand Down