Merge pull request #42 from richmolj/fix-specs

Fix specs for Rails 5.1

Author: richmolj

gemfiles/rails_5.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", ['>= 5.0', '< 5.1']
+gem "rails", "~> 5.0"
 gem "jsonapi-rails", "~> 0.1.0", :require => "jsonapi/rails"
 gem "rspec-rails"
 

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

spec/sideloading_spec.rb

@@ -123,17 +123,16 @@
     end
   end
 
-  let(:state)  { State.create!(name: 'maine') }
-  let(:genre)  { Genre.create!(name: 'horror') }
-  let(:book1)  { Book.create!(title: 'The Shining', genre: genre) }
-  let(:book2)  { Book.create!(title: 'The Stand', genre: genre) }
+  let!(:state)  { State.create!(name: 'maine') }
+  let!(:genre)  { Genre.create!(name: 'horror') }
+  let!(:book1)  { Book.create!(title: 'The Shining', author: author, genre: genre) }
+  let!(:book2)  { Book.create!(title: 'The Stand', author: author, genre: genre) }
 
   let!(:author) do
     Author.create! \
       first_name: 'Stephen',
       last_name: 'King',
-      state: state,
-      books: [book1, book2]
+      state: state
   end
 
   def json