diff --git a/Appraisals b/Appraisals index 540b227..af201fe 100644 --- a/Appraisals +++ b/Appraisals @@ -1,11 +1,11 @@ appraise "rails-4" do gem "rails", "~> 4.1" - gem 'jsonapi-rails', '~> 0.1', require: 'jsonapi/rails' + gem 'jsonapi-rails', '~> 0.1.0', require: 'jsonapi/rails' gem 'rspec-rails' end appraise "rails-5" do gem "rails", "~> 5.0" - gem 'jsonapi-rails', '~> 0.1', require: 'jsonapi/rails' + gem 'jsonapi-rails', '~> 0.1.0', require: 'jsonapi/rails' gem 'rspec-rails' end diff --git a/gemfiles/rails_4.gemfile b/gemfiles/rails_4.gemfile index 3a0ff15..32a8a8c 100644 --- a/gemfiles/rails_4.gemfile +++ b/gemfiles/rails_4.gemfile @@ -3,15 +3,15 @@ source "https://rubygems.org" gem "rails", "~> 4.1" -gem "jsonapi-rails", "~> 0.1", :require => "jsonapi/rails" +gem "jsonapi-rails", "~> 0.1.0", require: "jsonapi/rails" gem "rspec-rails" group :test do gem "pry" - gem "pry-byebug", :platform => [:mri] + gem "pry-byebug", platform: [:mri] gem "appraisal" gem "guard" gem "guard-rspec" end -gemspec :path => "../" +gemspec path: "../" diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile index 2ceacd1..48d26b6 100644 --- a/gemfiles/rails_5.gemfile +++ b/gemfiles/rails_5.gemfile @@ -2,16 +2,16 @@ source "https://rubygems.org" -gem "rails", ['>= 5.0', '< 5.1'] -gem "jsonapi-rails", "~> 0.1", :require => "jsonapi/rails" +gem "rails", "~> 5.0" +gem "jsonapi-rails", "~> 0.1.0", require: "jsonapi/rails" gem "rspec-rails" group :test do gem "pry" - gem "pry-byebug", :platform => [:mri] + gem "pry-byebug", platform: [:mri] gem "appraisal" gem "guard" gem "guard-rspec" end -gemspec :path => "../" +gemspec path: "../" diff --git a/jsonapi_compliable.gemspec b/jsonapi_compliable.gemspec index 59e502b..1accb63 100644 --- a/jsonapi_compliable.gemspec +++ b/jsonapi_compliable.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_dependency 'jsonapi-serializable', '~> 0.1' + spec.add_dependency 'jsonapi-serializable', '~> 0.1.0' spec.add_development_dependency "activerecord", ['>= 4.1', '< 6'] spec.add_development_dependency "kaminari", '~> 0.17' diff --git a/spec/integration/rails/persistence_spec.rb b/spec/integration/rails/persistence_spec.rb index 899745d..15b8ca3 100644 --- a/spec/integration/rails/persistence_spec.rb +++ b/spec/integration/rails/persistence_spec.rb @@ -48,12 +48,12 @@ def do_post end def do_put(id) - put :update, id: id, params: payload + put :update, params: payload.merge(id: id) end before do - @request.headers['Accept'] = Mime::JSON - @request.headers['Content-Type'] = Mime::JSON.to_s + @request.headers['Accept'] = Mime[:json] + @request.headers['Content-Type'] = Mime[:json].to_s routes.draw { post "create" => "anonymous#create" @@ -138,12 +138,12 @@ def do_put(id) let(:employee) { Employee.create!(first_name: 'Joe') } it 'deletes the object' do - delete :destroy, id: employee.id + delete :destroy, params: { id: employee.id } expect { employee.reload }.to raise_error(ActiveRecord::RecordNotFound) end it 'responds with object' do - delete :destroy, id: employee.id + delete :destroy, params: { id: employee.id } expect(json_item['id']).to eq(employee.id.to_s) expect(json_item['first_name']).to eq('Joe') end