GitHub PushEvent at 2014-03-24 20:11:45
Repository: surveyor
Actor: yoon
Payload: {"shas":[["82aa04e4eee00820197dcc44bd040a04addceeca","47532286a6836c5725c87c90fc8812be748cac6e@gmail.com","Merge branch 'feature/rails_4' into develop","N.T. Tuddenham",false],["ce35340bc7da9dad2cb2ea05604dbdf766aae79e","47532286a6836c5725c87c90fc8812be748cac6e@gmail.com","merged","N.T. Tuddenham",false],["fb511b26a0e3c8e53b85eb51c83c52150796bc9e","47532286a6836c5725c87c90fc8812be748cac6e@gmail.com","updated README","N.T. Tuddenham",false],["4727a8201abfc4112f9bd0778d85ee51c03ce8ec","e12d741628772516fe39f105ac1011a5499da24d@affectiva.com","pin database_cleaner to version 1.0.1\n\nThe tests were failing with:\n~/.rvm/gems/ruby-2.0.0-p247/gems/database_cleaner-1.1.0/lib/database_cleaner/active_record/truncation.rb:123:in `db_version': undefined local variable or method `postgresql_version' for #<ActiveRecord::ConnectionAdapters::SQLite3Adapter:0x007fd28ac70df8> (NameError)\n\nHere's the bug report: https://github.com/bmabey/database_cleaner/issues/224\n\nLooks like it might be a while until a fix happens so for the time\nbeing we'll pin database_cleaner to version 1.0.1 which appears to\nwork.","toby cabot",false],["8ba5e96640d75d98068ad6ea16a367cbf575e49e","e12d741628772516fe39f105ac1011a5499da24d@affectiva.com","replace rspec stub!() with stub() to quiet deprecation warnings\n\nDEPRECATION: stub! is deprecated. Use stub instead. Called from ~/surveyor/spec/models/dependency_spec.rb:71:in `block (2 levels) in <top (required)>'.\n\nhttp://www.mail-archive.com/rspec-users@rubyforge.org/msg13270.html\n\n   The original method was stub!, which I will confess to introducing,\n   and for the wrong reasons, due to my misunderstanding of the meaning\n   of ! in ruby methods.\n\n   I recently added stub (with no !) with no particular fanfare, as I\n   don't intend to remove stub! (at least not any time soon). Right now\n   the docs don't make it clear, so I need to fix that - but I'd say that\n   stub() is the method to use and stub!() is there for backwards\n   compatibility.","toby cabot",false],["b59ecfd818f6b819c22196ef2bc67c327e8a7a48","e12d741628772516fe39f105ac1011a5499da24d@affectiva.com","replace Relation#all with other methods to quiet deprecation warnings\n\nDEPRECATION WARNING: Relation#all is deprecated. If you want to eager-load a relation, you can call #load (e.g. `Post.where(published: true).load`). If you want to get an array of records from a relation, you can call #to_a (e.g. `Post.where(published: true).to_a`). (called from to_hash at /Users/tcabot/Code/surveyor/lib/surveyor/models/dependency_condition_methods.rb:39)","toby cabot",false],["38f4b3d7d7083a2db5e7d4b198ddfa4b9102125b","e12d741628772516fe39f105ac1011a5499da24d@affectiva.com","refactor call to find(:first) to quiet deprecation warnings\n\nDEPRECATION WARNING: Calling #find(:first) is deprecated. Please call #first directly instead. (called from edit at ~/surveyor/lib/surveyor/surveyor_controller_methods.rb:63)\n\nRefactored so that we call either first() or find() depending on\nwhether we've got a primary key or not.","toby cabot",false],["50ba0fa23d5eadd0af60eb3fdbc7711123a2da14","e12d741628772516fe39f105ac1011a5499da24d@affectiva.com","fix deprecation warnings about calling find_by with options\n\nDEPRECATION WARNING: Calling find_by or find_by! methods with options is deprecated. Build a scope instead, e.g. User.where('age > 21').find_by_name('Jon'). (called from block in load_and_update_response_set at ~/surveyor/lib/surveyor/surveyor_controller_methods.rb:112)","toby cabot",false],["ade06eae7d6f8ff6e5a3d7db2d2f5575b49045db","e12d741628772516fe39f105ac1011a5499da24d@affectiva.com","fix deprecation warnings about calling scope() with a hash\n\nDEPRECATION WARNING: Calling #scope or #default_scope with a hash is deprecated. Please use a lambda containing a scope. E.g. scope :red, -> { where(color: 'red') }. (called from included at ~/surveyor/lib/surveyor/models/answer_methods.rb:13)\n\nWe use instance_eval because we need the scope lambda to run in the\ncontext of the including Class, not the Module in which the code is\ndefined.","toby cabot",false],["33a9f62b407805dcceed020889034b93ebc066ef","e12d741628772516fe39f105ac1011a5499da24d@affectiva.com","fix deprecation warnings relating to has_many declarations\n\nDEPRECATION WARNING: The following options in your ResponseSet.has_many :responses declaration are deprecated: :order. Please use a scope block instead.\n\nWe use instance_eval because we need the scope lambda to run in the\ncontext of the including Class, not the Module in which the code is\ndefined.","toby cabot",false],["d6dbce552a22eb3a0f8a052f6440e315a4fb3ff2","e12d741628772516fe39f105ac1011a5499da24d@affectiva.com","removed \"unloadable\" declarations\n\nThey were causing circular dependency errors in development when\nclasses changed and had to be recompiled.  Turns out they're no longer\nneeded for Rails 4:\n\n   https://github.com/thoughtbot/clearance/issues/276\n   https://github.com/thoughtbot/clearance/pull/277\n\nIn development if I change one of the classes it recompiles, even\nwithout the \"unloadable\" declaration, and I no longer get circular\ndependency errors.","toby cabot",false],["940b29963b918161b3e5ff06c53d4086fb32e0c6","e12d741628772516fe39f105ac1011a5499da24d@affectiva.com","move images to where sprockets expects them to be\n\nSprockets expects images in an engine to be in an [engine name]\ndirectory, but the jquery ui images weren't.\n\nThe jquery ui stylesheet had to change, too, to reference images\nstarting at \"/\" rather than relative URL's.","toby cabot",false],["0f56592366e2192144d3b0f97acd1c9cb1451db9","e12d741628772516fe39f105ac1011a5499da24d@affectiva.com","fix code that figures out if the asset pipeline is enabled\n\nThe Rails3-compatible algorithm to figure out if the asset pipeline is\ndoesn't work with Rails4.  Quite frankly, the new one doesn't seem as\nclean as the old one, but hopefully this code will work in all cases.\n\nhttps://github.com/rails/rails/issues/10334\n\nNote that the specs didn't seem to test both cases, or else the image\npath is now the same whether the pipeline is enabled or not, but in\nany case the specs don't need to determine whether the pipeline is\nenabled, they can use the same path in all cases.","toby cabot",false],["9e6b9c3ceaabd7c0bca8b50691f3ebb7b3b50990","e12d741628772516fe39f105ac1011a5499da24d@affectiva.com","added a dependency on rails-observers\n\nThis used to be part of core Rails but in 4.0 was moved into its own\ngem, so we need to indicate that we depend on it.  Otherwise, in an\neager_load=true environment we'll get:\nuninitialized constant ActionController::Caching::Sweeper","toby cabot",false],["fa6a605133472d670232615adc895c85c2ef726c","e12d741628772516fe39f105ac1011a5499da24d@affectiva.com","fix slow_updates monkey patch\n\nNeeded to inherit from ApplicationController.","toby cabot",false],["d00f6c284260ff09b92234a99e2102f2bc7d9482","e12d741628772516fe39f105ac1011a5499da24d@affectiva.com","add dependency on selenium-webdriver\n\nWithout the explicit dependency the tests would crash immediately.","toby cabot",false],["7cd125375ac0d5e7fab013c3fc9a7263ae29458f","e12d741628772516fe39f105ac1011a5499da24d@affectiva.com","downgrade back to older versions of cucumber-rails and capybara\n\nI was hoping to upgrade these to the latest versions but they're\nincompatible enough that it will take some effort to upgrade them.","toby cabot",false],["95c3c76a92b4db4a5b3f07f7d6e947cc0ed41cdd","e12d741628772516fe39f105ac1011a5499da24d@affectiva.com","kludge: load formtastic enhancements explicitly\n\nMany cucumber tests were failing because the views couldn't find a\n\"QuietInput\" class.  It has something to do with dynamic reloading of\nclasses but I couldn't figure it out (sorry) so I fell back to loading\nthe classes explicitly before each scenario.  it's a kludge but it\nworks.","toby cabot",false],["1ab7347f38fa7704641d3e94aa343506ce052c2c","e12d741628772516fe39f105ac1011a5499da24d@affectiva.com","fix regexp serialization\n\nEvidently in Rails 3.x active record would implicitly serialize Regexp\nfields into YAML so for, for example, the ValidationCondition regexp\nfield would be implicitly converted from /[0-9a-zA-z\\. #]/ to \"---\n!ruby/regexp '/[0-9a-zA-z\\\\. #]/'\\n\" when the model was saved.  In 4.0\nthis implicit serialization doesn't happen so we need to tell AR to do\nit explicitly using AR's serialize method.","toby cabot",false],["4f75a6dcd3f0912f6833624686641f2729b65a46","e12d741628772516fe39f105ac1011a5499da24d@affectiva.com","update database_cleaner\n\nDatabase cleaner used to have a bug that caused our tests to fail, but\nthey've released 1.2.0 which works so we no longer need to pin to the\nold 1.0.1 release.","toby cabot",false]],"size":39,"ref":"refs/heads/master","head":"1656342cee451fd0912ef03abb16930e74d3cfb6"}