From c604e69d77b936712d2d673777e46abb80b9d05c Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Fri, 16 Dec 2016 16:56:58 -0500 Subject: [PATCH 1/2] enable postgresql 9.4 in travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 99b9a655..3dca7316 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,3 +22,4 @@ script: addons: code_climate: repo_token: 479d3bf56798fbc7fff3fc8151a5ed09e8ac368fd5af332c437b9e07dbebb44e + postgresql: "9.4" From 7ca7f0862f955e3aac487ae32a12f295c57caf74 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Fri, 16 Dec 2016 17:08:57 -0500 Subject: [PATCH 2/2] fix mapping spec --- spec/controllers/mappings_controller_spec.rb | 1 + spec/factories/mappings.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/spec/controllers/mappings_controller_spec.rb b/spec/controllers/mappings_controller_spec.rb index 8d1c424d..e5f59db7 100644 --- a/spec/controllers/mappings_controller_spec.rb +++ b/spec/controllers/mappings_controller_spec.rb @@ -24,6 +24,7 @@ RSpec.describe MappingsController, type: :controller do post :create, params: { mapping: valid_attributes } + mapping.updated_by = controller.current_user expect(comparable(Mapping.last)).to eq comparable(mapping) end end diff --git a/spec/factories/mappings.rb b/spec/factories/mappings.rb index 1bcdf891..ec06b613 100644 --- a/spec/factories/mappings.rb +++ b/spec/factories/mappings.rb @@ -5,6 +5,7 @@ FactoryGirl.define do yloc 0 map user + association :updated_by, factory: :user association :mappable, factory: :topic factory :mapping_random_location do