Skip to content

Update dependencies and fix test #128

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

Open
nulltask wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Update dependencies and fix test #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
98d88a1
Bump version to middleman >= 4.1.11
nulltask Jan 10, 2017
2d71d51
Switch dependency from middleman-core to middleman
nulltask Jan 10, 2017
9710415
Add capybara to test dependencies
nulltask Jan 10, 2017
3c7ecbe
Bump cucumber and aruba
nulltask Jan 10, 2017
d81b556
Fix deprecation warning from codeclimate-test-reporter
nulltask Jan 10, 2017
7ea2814
Disable fivemat temporary because it's broken in cucumber 2
nulltask Jan 10, 2017
eaef09c
Change required ruby version to 2.2.2 because activesupport requires …
nulltask Jan 10, 2017
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
7 changes: 3 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ rvm:
- ruby
- jruby-head
- jruby
- 2.1.0
- 2.0.0
- 1.9.3
- 2.2.2
- 2.3.3
- rbx-2
before_script: bundle update
matrix:
Expand All @@ -23,4 +22,4 @@ matrix:
notifications:
email: false
env:
- CODECLIMATE_REPO_TOKEN=5eee8e8624962f963a52a1d2313dc7407e3b8006291e3704346c786642cc073b
- CODECLIMATE_REPO_TOKEN=5eee8e8624962f963a52a1d2313dc7407e3b8006291e3704346c786642cc073b
6 changes: 4 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ gemspec

group :test do
gem 'rake', '~> 10.0'
gem 'cucumber', '~> 1.3'
gem 'aruba', '~> 0.5'
gem 'fivemat'
gem 'cucumber', '~> 2.0'
gem 'capybara'
gem 'aruba', '~> 0.7.4'
gem 'simplecov'
gem 'codeclimate-test-reporter'
end
2 changes: 1 addition & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundler::GemHelper.install_tasks
require 'cucumber/rake/task'
Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
exempt_tags = ['--tags ~@wip']
t.cucumber_opts = "--color #{exempt_tags.join(' ')} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
t.cucumber_opts = "--color #{exempt_tags.join(' ')} --strict # --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
Copy link
Contributor

@runlevel5 runlevel5 Oct 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any reason why the formatter option is commented out?

end

begin
Expand Down
4 changes: 2 additions & 2 deletions features/support/env.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
require 'middleman-core'
require 'middleman-core/step_definitions'

require 'codeclimate-test-reporter'
Copy link
Contributor

@runlevel5 runlevel5 Oct 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this project still using Codeclimate?

CodeClimate::TestReporter.start
require 'simplecov'
SimpleCov.start

require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-deploy')
4 changes: 2 additions & 2 deletions middleman-deploy.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ['lib']
spec.required_ruby_version = '>= 1.9.3'
spec.required_ruby_version = '>= 2.2.2'

spec.add_dependency 'middleman-core', '>= 3.2'
spec.add_dependency 'middleman', '>= 4.1.11'
spec.add_dependency 'ptools'
spec.add_dependency 'net-sftp'

Expand Down