Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions gemfiles/rails_4.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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: "../"
8 changes: 4 additions & 4 deletions gemfiles/rails_5.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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: "../"
2 changes: 1 addition & 1 deletion jsonapi_compliable.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
10 changes: 5 additions & 5 deletions spec/integration/rails/persistence_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down