Skip to content

Commit

Permalink
wait with ruby 2.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Fenner committed May 10, 2019
1 parent be9f66f commit 7035fee
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM phusion/passenger-full:1.0.5
FROM phusion/passenger-full:0.9.30
LABEL maintainer="[email protected]"

# Set correct environment variables.
Expand All @@ -10,6 +10,9 @@ RUN usermod -a -G docker_env app
# Use baseimage-docker's init process.
CMD ["/sbin/my_init"]

# Install Ruby 2.4.4
RUN bash -lc 'rvm --default use ruby-2.4.4'

# Update installed APT packages
RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
apt-get install ntp wget tzdata pandoc -y && \
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ gem 'graphql-errors', '~> 0.3.0'
# gem 'graphql-cache', '~> 0.6.0'

group :development, :test do
gem 'rspec-rails', '~> 3.5', '>= 3.5.2'
gem 'rspec-rails', '~> 3.8', '>= 3.8.2'
gem 'rspec-benchmark', '~> 0.4.0'
gem 'rubocop', '~> 0.68.1', require: false
gem 'rubocop-performance', '~> 1.2', require: false
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ DEPENDENCIES
rails (~> 5.2.0)
rake (~> 12.0)
rspec-benchmark (~> 0.4.0)
rspec-rails (~> 3.5, >= 3.5.2)
rspec-rails (~> 3.8, >= 3.8.2)
rubocop (~> 0.68.1)
rubocop-performance (~> 1.2)
sentry-raven (~> 2.9)
Expand Down
2 changes: 1 addition & 1 deletion spec/concerns/helpable_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
response = subject.get_url

expect(response.body.dig("data", "responseCode")).to eq(1)
expect(response.body.dig("data", "values")).to eq([{"index"=>1, "type"=>"URL", "data"=>{"format"=>"string", "value"=>"https://blog.datacite.org/"}, "ttl"=>86400, "timestamp"=>"2018-09-26T08:52:01Z"}])
expect(response.body.dig("data", "values")).to eq([{"index"=>1, "type"=>"URL", "data"=>{"format"=>"string", "value"=>"https://blog.datacite.org/"}, "ttl"=>86400, "timestamp"=>"2019-05-10T12:45:27Z"}])
end

# it 'should register on save' do
Expand Down
14 changes: 7 additions & 7 deletions spec/fixtures/vcr_cassettes/Doi/register_doi/should_register.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7035fee

Please sign in to comment.