From 305410f7a38cb6bbc290c0a2e8c3959a3af2a317 Mon Sep 17 00:00:00 2001 From: Xavier J Date: Tue, 15 Nov 2016 17:20:36 +0100 Subject: [PATCH] Fix Gemfile.lock and tests --- Gemfile.lock | 369 +++++++++--------- .../api/v1/dossiers_controller_spec.rb | 3 +- 2 files changed, 190 insertions(+), 182 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3789d86e8..319e88f59 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,15 +1,15 @@ GIT remote: https://github.com/mina-deploy/mina.git - revision: 5f407b28be1cf05cdfaab0558285aa031c445491 + revision: a66b55a72833b19ac0ffb240afb37c86c0227582 specs: - mina (1.0.3) + mina (0.3.7) open4 (~> 1.3.4) rake GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.3) + CFPropertyList (2.3.2) actionmailer (4.2.7.1) actionpack (= 4.2.7.1) actionview (= 4.2.7.1) @@ -29,11 +29,8 @@ GEM erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - active_model_serializers (0.10.2) - actionpack (>= 4.1, < 6) - activemodel (>= 4.1, < 6) - jsonapi (~> 0.1.1.beta2) - railties (>= 4.1, < 6) + active_model_serializers (0.8.3) + activemodel (>= 3.0) activejob (4.2.7.1) activesupport (= 4.2.7.1) globalid (>= 0.3.0) @@ -50,8 +47,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.3.8) apipie-rails (0.3.1) json arel (6.0.3) @@ -59,61 +55,74 @@ GEM actionpack (>= 3.0) activemodel (>= 3.0) responders - ast (2.3.0) - attr_required (1.0.1) - autoprefixer-rails (6.5.3) + ast (2.0.0) + astrolabe (1.3.0) + parser (>= 2.2.0.pre.3, < 3.0) + attr_required (1.0.0) + autoprefixer-rails (5.2.1) execjs + json axlsx (2.0.1) htmlentities (~> 4.3.1) nokogiri (>= 1.4.1) rubyzip (~> 1.0.0) bcrypt (3.1.11) - bindata (2.3.4) + bindata (2.1.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-datepicker-rails (1.6.4.1) + bootstrap-datepicker-rails (1.4.0) railties (>= 3.0) - bootstrap-sass (3.3.7) - autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) + bootstrap-sass (3.3.5) + autoprefixer-rails (>= 5.0.0.1) + sass (>= 3.2.19) bootstrap-wysihtml5-rails (0.3.3.8) railties (>= 3.0) - brakeman (3.4.1) - browser (2.3.0) + brakeman (3.1.1) + erubis (~> 2.6) + fastercsv (~> 1.5) + haml (>= 3.0, < 5.0) + highline (~> 1.6) + multi_json (~> 1.2) + ruby2ruby (>= 2.1.1, < 2.3.0) + ruby_parser (~> 3.7.0) + sass (~> 3.0) + slim (>= 1.3.6, < 4.0) + terminal-table (~> 1.4) + browser (2.2.0) builder (3.2.2) - byebug (9.0.6) - capybara (2.10.1) - addressable + byebug (5.0.0) + columnize (= 0.9.0) + capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - carrierwave (0.11.2) + carrierwave (0.10.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) json (>= 1.7) mime-types (>= 1.16) - mimemagic (>= 0.3.0) - chartkick (2.1.1) - childprocess (0.5.9) + chartkick (1.3.2) + childprocess (0.5.5) ffi (~> 1.0, >= 1.0.11) - clamav-client (3.1.0) + clamav-client (3.0.0) cliver (0.3.2) - coderay (1.1.1) - coffee-rails (4.1.1) + coderay (1.1.0) + coffee-rails (4.1.0) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) + railties (>= 4.0.0, < 5.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) + coffee-script-source (1.9.1.1) + columnize (0.9.0) concurrent-ruby (1.0.2) - crack (0.4.3) + crack (0.4.2) safe_yaml (~> 1.0.0) - database_cleaner (1.5.3) + database_cleaner (1.4.1) debug_inspector (0.0.2) - deep_cloneable (2.2.2) + deep_cloneable (2.2.1) activerecord (>= 3.1.0, < 5.2.0) devise (3.5.10) bcrypt (~> 3.0) @@ -124,7 +133,7 @@ GEM warden (~> 1.2.3) diff-lcs (1.2.5) docile (1.1.5) - domain_name (0.5.20161021) + domain_name (0.5.24) unf (>= 0.0.5, < 1.0.0) draper (2.1.0) actionpack (>= 3.0) @@ -132,13 +141,14 @@ GEM activesupport (>= 3.0) request_store (~> 1.0) erubis (2.7.0) - excon (0.54.0) + excon (0.49.0) execjs (2.7.0) - factory_girl (4.7.0) + factory_girl (4.5.0) activesupport (>= 3.0.0) - faraday (0.9.2) + faraday (0.9.1) multipart-post (>= 1.2, < 3) - ffi (1.9.14) + fastercsv (1.5.5) + ffi (1.9.6) fission (0.5.0) CFPropertyList (~> 2.2) fog (1.38.0) @@ -178,12 +188,12 @@ GEM fog-atmos (0.1.0) fog-core fog-xml - fog-aws (0.12.0) - fog-core (~> 1.38) + fog-aws (0.9.2) + fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-brightbox (0.11.0) + fog-brightbox (0.10.1) fog-core (~> 1.22) fog-json inflecto (~> 0.0.2) @@ -192,7 +202,7 @@ GEM fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.43.0) + fog-core (1.38.0) builder excon (~> 0.49) formatador (~> 0.2) @@ -210,20 +220,22 @@ GEM fog-json (1.0.2) fog-core (~> 1.0) multi_json (~> 1.10) - fog-local (0.3.1) + fog-local (0.3.0) fog-core (~> 1.27) - fog-openstack (0.1.17) - fog-core (>= 1.40) + fog-openstack (0.1.5) + fog-core (>= 1.38) fog-json (>= 1.0) + fog-xml (>= 0.1) ipaddress (>= 0.8) fog-powerdns (0.1.1) fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) - fog-profitbricks (3.0.0) - fog-core (~> 1.42) - fog-json (~> 1.0) - fog-rackspace (0.1.2) + fog-profitbricks (0.0.5) + fog-core + fog-xml + nokogiri + fog-rackspace (0.1.1) fog-core (>= 1.35) fog-json (>= 1.0) fog-xml (>= 0.1) @@ -242,7 +254,7 @@ GEM fog-serverlove (0.1.2) fog-core fog-json - fog-softlayer (1.1.4) + fog-softlayer (1.1.1) fog-core fog-json fog-storm_on_demand (0.1.1) @@ -257,21 +269,21 @@ GEM fog-voxel (0.1.0) fog-core fog-xml - fog-vsphere (1.5.1) + fog-vsphere (0.6.4) fog-core - rbvmomi (~> 1.9) + rbvmomi (~> 1.8) fog-xenserver (0.2.3) fog-core fog-xml fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.7.0.0) - railties (>= 3.2, < 5.1) + font-awesome-rails (4.4.0.0) + railties (>= 3.2, < 5.0) formatador (0.2.5) globalid (0.3.7) activesupport (>= 4.1.0) - haml (4.0.7) + haml (4.0.6) tilt haml-rails (0.9.0) actionpack (>= 4.0.1) @@ -279,113 +291,105 @@ GEM haml (>= 4.0.6, < 5.0) html2haml (>= 1.0.1) railties (>= 4.0.1) - hashdiff (0.3.0) - hashie (3.4.6) + hashie (3.4.1) + highline (1.7.8) html2haml (2.0.0) erubis (~> 2.7.0) haml (~> 4.0.0) nokogiri (~> 1.6.0) ruby_parser (~> 3.5) htmlentities (4.3.4) - http-cookie (1.0.3) + http-cookie (1.0.2) domain_name (~> 0.5) - httpclient (2.8.2.4) + httpclient (2.6.0.1) i18n (0.7.0) inflecto (0.0.2) ipaddress (0.8.3) - jbuilder (2.6.0) - activesupport (>= 3.0.0, < 5.1) + jbuilder (2.3.1) + activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) - jquery-rails (4.2.1) - rails-dom-testing (>= 1, < 3) + jquery-rails (4.0.4) + rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.3) - json-jwt (1.6.5) + json-jwt (1.5.1) activesupport bindata multi_json (>= 1.3) securecompare url_safe_base64 - jsonapi (0.1.1.beta6) - jsonapi-parser (= 0.1.1.beta3) - jsonapi-renderer (= 0.1.1.beta1) - jsonapi-parser (0.1.1.beta3) - jsonapi-renderer (0.1.1.beta1) - kaminari (0.17.0) + kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - kgio (2.10.0) + kgio (2.9.3) leaflet-draw-rails (0.1.0) leaflet-markercluster-rails (0.7.0) railties (>= 3.1) - leaflet-rails (0.7.7) - libv8 (3.16.14.15) + leaflet-rails (0.7.4) + libv8 (3.16.14.7) logstash-event (1.2.02) - logstasher (1.0.1) - activerecord (>= 4.0) - activesupport (>= 4.0) + logstasher (0.6.5) logstash-event (~> 1.2.0) request_store loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.4) mime-types (>= 1.16, < 4) - mailjet (1.4.10) + mailjet (1.1.0) activesupport (>= 3.1.0) rack (>= 1.4.0) rest-client maruku (0.7.2) method_source (0.8.2) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mimemagic (0.3.2) + mime-types (2.99.2) mini_portile2 (2.1.0) - minitest (5.9.1) - multi_json (1.12.1) + minitest (5.9.0) + multi_json (1.11.2) multipart-post (2.0.0) - netrc (0.11.0) - nokogiri (1.6.8.1) + netrc (0.10.3) + nokogiri (1.6.8) mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) nyan-cat-formatter (0.11) rspec (>= 2.99, >= 2.14.2, < 4) open4 (1.3.4) - openid_connect (0.12.0) + openid_connect (0.9.2) activemodel attr_required (>= 1.0.0) json (>= 1.4.3) json-jwt (>= 1.5.0) - rack-oauth2 (>= 1.3.1) + rack-oauth2 (>= 1.2.1) swd (>= 1.0.0) tzinfo validate_email validate_url webfinger (>= 1.0.1) - openstack (3.3.3) + openstack (2.0.2) json orm_adapter (0.5.0) parallel (1.9.0) parallel_tests (1.9.0) parallel - parser (2.3.1.4) - ast (~> 2.2) - pg (0.19.0) - poltergeist (1.11.0) + parser (2.2.2.2) + ast (>= 1.1, < 3.0) + pg (0.18.2) + pkg-config (1.1.7) + poltergeist (1.6.0) capybara (~> 2.1) cliver (~> 0.3.1) + multi_json (~> 1.0) websocket-driver (>= 0.2.0) - powerpack (0.1.1) - pry (0.10.4) + powerpack (0.1.0) + pry (0.10.1) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pry-byebug (3.4.0) - byebug (~> 9.0) + pry-byebug (3.2.0) + byebug (~> 5.0) pry (~> 0.10) - public_suffix (2.0.4) - rack (1.6.5) - rack-oauth2 (1.4.0) + rack (1.6.4) + rack-oauth2 (1.2.1) activesupport (>= 2.3) attr_required (>= 0.0.5) httpclient (>= 2.4) @@ -393,7 +397,7 @@ GEM rack (>= 1.1) rack-test (0.6.3) rack (>= 1.0) - railroady (1.5.2) + railroady (1.3.0) rails (4.2.7.1) actionmailer (= 4.2.7.1) actionpack (= 4.2.7.1) @@ -418,63 +422,65 @@ GEM activesupport (= 4.2.7.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) - raindrops (0.17.0) - rake (11.3.0) - rbvmomi (1.9.4) - builder (~> 3.2) - json (>= 1.8) - nokogiri (~> 1.5) - trollop (~> 2.1) - rdoc (4.3.0) + rainbow (2.0.0) + raindrops (0.13.0) + rake (11.2.2) + rbvmomi (1.8.2) + builder + nokogiri (>= 1.4.1) + trollop + rdoc (4.2.0) + json (~> 1.4) ref (2.0.0) - request_store (1.3.1) + request_store (1.1.0) responders (2.3.0) railties (>= 4.2.0, < 5.1) - rest-client (2.0.0) + rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) - rgeo (0.5.3) - rgeo-geojson (0.4.3) - rgeo (~> 0.5) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) + rgeo (0.3.20) + rgeo-geojson (0.3.1) + rgeo (~> 0.3) rodf (0.3.7) activesupport (>= 3.0, < 6.0) builder (~> 3.0) rubyzip (~> 1.0) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec (3.2.0) + rspec-core (~> 3.2.0) + rspec-expectations (~> 3.2.0) + rspec-mocks (~> 3.2.0) + rspec-core (3.2.3) + rspec-support (~> 3.2.0) + rspec-expectations (3.2.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.2.0) + rspec-mocks (3.2.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) - rubocop (0.45.0) - parser (>= 2.3.1.1, < 3.0) + rspec-support (~> 3.2.0) + rspec-rails (3.2.1) + actionpack (>= 3.0, < 4.3) + activesupport (>= 3.0, < 4.3) + railties (>= 3.0, < 4.3) + rspec-core (~> 3.2.0) + rspec-expectations (~> 3.2.0) + rspec-mocks (~> 3.2.0) + rspec-support (~> 3.2.0) + rspec-support (3.2.2) + rubocop (0.30.1) + astrolabe (~> 1.3) + parser (>= 2.2.2.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-checkstyle_formatter (0.3.0) - rubocop (>= 0.30.1) - rubocop-rspec (1.8.0) - rubocop (>= 0.42.0) - ruby-progressbar (1.8.1) - ruby_parser (3.8.3) + ruby-progressbar (~> 1.4) + rubocop-checkstyle_formatter (0.2.0) + rubocop (>= 0.20.1) + rubocop-rspec (1.3.0) + ruby-progressbar (1.7.5) + ruby2ruby (2.1.4) + ruby_parser (~> 3.1) + sexp_processor (~> 4.0) + ruby_parser (3.7.0) sexp_processor (~> 4.1) rubyzip (1.0.0) safe_yaml (1.0.4) @@ -488,71 +494,75 @@ GEM scenic (1.3.0) activerecord (>= 4.0.0) railties (>= 4.0.0) - sdoc (0.4.2) + sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) securecompare (1.0.0) - selenium-webdriver (3.0.1) + selenium-webdriver (2.44.0) childprocess (~> 0.5) + multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0) - sentry-raven (2.1.2) - faraday (>= 0.7.6, < 0.10.x) - sexp_processor (4.7.0) - shoulda-matchers (3.1.1) - activesupport (>= 4.0.0) - simplecov (0.12.0) + sentry-raven (0.13.1) + faraday (>= 0.7.6) + sexp_processor (4.6.0) + shoulda-matchers (2.8.0) + activesupport (>= 3.0.0) + simplecov (0.9.1) docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + multi_json (~> 1.0) + simplecov-html (~> 0.8.0) + simplecov-html (0.8.0) + slim (3.0.6) + temple (~> 0.7.3) + tilt (>= 1.3.3, < 2.1) slop (3.6.0) - smart_listing (1.2.0) + smart_listing (1.1.2) coffee-rails jquery-rails - kaminari (~> 0.17) + kaminari (~> 0.16.1) rails (>= 3.2) spreadsheet_architect (1.4.7) axlsx (>= 2.0) rodf (>= 0.3.6) - spring (2.0.0) - activesupport (>= 4.2) + spring (1.3.6) spring-commands-rspec (1.0.4) spring (>= 0.9.1) sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.1.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - swd (1.0.1) + swd (1.0.0) activesupport (>= 3) attr_required (>= 0.0.5) httpclient (>= 2.4) i18n json (>= 1.4.3) + temple (0.7.6) + terminal-table (1.5.2) therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref thor (0.19.1) thread_safe (0.3.5) tilt (2.0.5) - timecop (0.8.1) + timecop (0.7.3) trollop (2.1.2) - turbolinks (5.0.1) - turbolinks-source (~> 5) - turbolinks-source (5.0.0) + turbolinks (2.5.3) + coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.0.3) + uglifier (3.0.2) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) - unicode-display_width (1.1.1) - unicorn (5.2.0) + unf_ext (0.0.7.1) + unicorn (4.9.0) kgio (~> 2.6) + rack raindrops (~> 0.7) url_safe_base64 (0.2.2) validate_email (0.1.6) @@ -561,27 +571,26 @@ GEM validate_url (1.0.2) activemodel (>= 3.0.0) addressable - vcr (3.0.3) + vcr (3.0.1) warden (1.2.6) rack (>= 1.0) - web-console (2.3.0) + web-console (2.2.1) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) - webfinger (1.0.2) + webfinger (1.0.1) activesupport httpclient (>= 2.4) multi_json - webmock (2.1.0) + webmock (1.21.0) addressable (>= 2.3.6) crack (>= 0.3.2) - hashdiff - websocket (1.2.3) - websocket-driver (0.6.4) + websocket (1.2.1) + websocket-driver (0.5.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) - will_paginate (3.1.5) + will_paginate (3.0.7) will_paginate-bootstrap (1.0.1) will_paginate (>= 3.0.3) xml-simple (1.1.5) diff --git a/spec/controllers/api/v1/dossiers_controller_spec.rb b/spec/controllers/api/v1/dossiers_controller_spec.rb index 5295b7d49..0c00308bb 100644 --- a/spec/controllers/api/v1/dossiers_controller_spec.rb +++ b/spec/controllers/api/v1/dossiers_controller_spec.rb @@ -115,7 +115,7 @@ describe API::V1::DossiersController do let!(:dossier) { Timecop.freeze(date_creation) { create(:dossier, :with_entreprise, procedure: procedure) } } let(:dossier_id) { dossier.id } let(:body) { JSON.parse(retour.body, symbolize_names: true) } - let(:field_list) { [:id, :created_at, :updated_at, :archived, :mandataire_social, :total_commentaire, :entreprise, :etablissement, :cerfa, :types_de_piece_justificative, :pieces_justificatives, :champs, :champs_private, :commentaires, :state] } + let(:field_list) { [:id, :created_at, :updated_at, :archived, :mandataire_social, :entreprise, :etablissement, :cerfa, :types_de_piece_justificative, :pieces_justificatives, :champs, :champs_private, :commentaires, :state] } subject { body[:dossier] } it 'return REST code 200', :show_in_doc do @@ -127,7 +127,6 @@ describe API::V1::DossiersController do it { expect(subject[:updated_at]).to eq('2008-09-01T08:05:00.000Z') } it { expect(subject[:archived]).to eq(dossier.archived) } it { expect(subject[:mandataire_social]).to eq(dossier.mandataire_social) } - it { expect(subject[:total_commentaire]).to eq(dossier.total_commentaire) } it { expect(subject.keys).to match_array(field_list) }