From 7378810c575b905cc5bdbfe39d293740e5eacdcc Mon Sep 17 00:00:00 2001 From: Jeremy Prevost Date: Tue, 2 Feb 2016 12:59:02 -0500 Subject: [PATCH 1/2] Update dependencies --- Gemfile | 2 +- Gemfile.lock | 47 ++++++++++++++++++++++------------------------- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/Gemfile b/Gemfile index dcb5614..419816e 100644 --- a/Gemfile +++ b/Gemfile @@ -39,7 +39,7 @@ end group :development do gem 'annotate' gem 'rubocop' - gem 'web-console', '~> 2.0' + gem 'web-console' end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index f2996b0..de8d0ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -53,18 +53,16 @@ GEM ansi (1.5.0) arel (6.0.3) ast (2.2.0) - aws-sdk (2.2.13) - aws-sdk-resources (= 2.2.13) - aws-sdk-core (2.2.13) + aws-sdk (2.2.14) + aws-sdk-resources (= 2.2.14) + aws-sdk-core (2.2.14) jmespath (~> 1.0) - aws-sdk-resources (2.2.13) - aws-sdk-core (= 2.2.13) + aws-sdk-resources (2.2.14) + aws-sdk-core (= 2.2.14) bcrypt (3.1.10) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) bootstrap_form (2.3.0) builder (3.2.2) - byebug (8.2.1) + byebug (8.2.2) cancancan (1.13.1) capybara (2.6.2) addressable @@ -92,7 +90,7 @@ GEM delayed_job_active_record (4.1.0) activerecord (>= 3.0, < 5) delayed_job (>= 3.0, < 5) - devise (3.5.5) + devise (3.5.6) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -100,11 +98,11 @@ GEM thread_safe (~> 0.1) warden (~> 1.2.3) docile (1.1.5) - domain_name (0.5.25) + domain_name (0.5.20160128) unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) execjs (2.6.0) - fakes3 (0.2.3) + fakes3 (0.2.4) builder thor faraday (0.9.2) @@ -127,7 +125,7 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.3) - jwt (1.5.2) + jwt (1.5.1) less (2.6.0) commonjs (~> 0.2.7) less-rails (2.7.1) @@ -168,12 +166,12 @@ GEM netrc (0.11.0) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) - oauth2 (1.0.0) + oauth2 (1.1.0) faraday (>= 0.8, < 0.10) - jwt (~> 1.0) + jwt (~> 1.0, < 1.5.2) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) + rack (>= 1.2, < 3) omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) @@ -185,7 +183,7 @@ GEM orm_adapter (0.5.0) parser (2.3.0.2) ast (~> 2.2) - passenger (5.0.23) + passenger (5.0.24) rack rake (>= 0.8.1) pg (0.18.4) @@ -215,7 +213,7 @@ GEM rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging - rails_serve_static_assets (0.0.4) + rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.4) railties (4.2.5.1) actionpack (= 4.2.5.1) @@ -250,7 +248,7 @@ GEM sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.0) + sprockets-rails (3.0.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -278,13 +276,12 @@ GEM unf_ext unf_ext (0.0.7.1) vcr (3.0.1) - warden (1.2.5) + warden (1.2.6) rack (>= 1.0) - web-console (2.3.0) - activemodel (>= 4.0) - binding_of_caller (>= 0.7.2) - railties (>= 4.0) - sprockets-rails (>= 2.0, < 4.0) + web-console (3.1.1) + activemodel (>= 4.2) + debug_inspector + railties (>= 4.2) webmock (1.22.6) addressable (>= 2.3.6) crack (>= 0.3.2) @@ -333,7 +330,7 @@ DEPENDENCIES twitter-bootstrap-rails uglifier (>= 1.3.0) vcr - web-console (~> 2.0) + web-console webmock BUNDLED WITH From 2396d7cd4a5b0758a6a1f7c19b7d9a9c2e3a0354 Mon Sep 17 00:00:00 2001 From: Jeremy Prevost Date: Tue, 2 Feb 2016 15:01:52 -0500 Subject: [PATCH 2/2] add some missed annotations --- app/controllers/submissions_controller.rb | 21 +++++++++++++++++++ .../submissions_controller_test.rb | 21 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb index fb18f4e..50ff370 100644 --- a/app/controllers/submissions_controller.rb +++ b/app/controllers/submissions_controller.rb @@ -1,3 +1,24 @@ +# == Schema Information +# +# Table name: submissions +# +# id :integer not null, primary key +# user_id :integer +# title :string not null +# journal :string +# doi :string +# author :string +# doe :boolean +# grant_number :string +# agreed_to_license :boolean +# created_at :datetime not null +# updated_at :datetime not null +# documents :string +# status :string +# handle :string +# uuid :string +# + class SubmissionsController < ApplicationController before_action :authenticate_user! before_action :set_s3_direct_post, only: [:new, :create] diff --git a/test/controllers/submissions_controller_test.rb b/test/controllers/submissions_controller_test.rb index 6f51f21..0d4cfaf 100644 --- a/test/controllers/submissions_controller_test.rb +++ b/test/controllers/submissions_controller_test.rb @@ -1,3 +1,24 @@ +# == Schema Information +# +# Table name: submissions +# +# id :integer not null, primary key +# user_id :integer +# title :string not null +# journal :string +# doi :string +# author :string +# doe :boolean +# grant_number :string +# agreed_to_license :boolean +# created_at :datetime not null +# updated_at :datetime not null +# documents :string +# status :string +# handle :string +# uuid :string +# + require 'test_helper' class SubmissionsControllerTest < ActionController::TestCase