diff --git a/.gitignore b/.gitignore index 1cdb725a2..8d761de27 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,6 @@ bin/* config/initializers/token.rb config/initializers/super_admin.rb doc/*.svg -rubocop.html config/france_connect.yml config/initializers/mailjet.rb config/fog_credentials.yml diff --git a/.rubocop.yml b/.rubocop.yml deleted file mode 100644 index 341d26106..000000000 --- a/.rubocop.yml +++ /dev/null @@ -1,7 +0,0 @@ -require: rubocop-rspec -AllCops: - Exclude: - - db/**/* - RunRailsCops: true -Metrics/LineLength: - Enabled: false diff --git a/Gemfile b/Gemfile index ecd5df0e9..aea82425d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,5 @@ source 'https://rubygems.org' -# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'dotenv-rails', groups: [:development, :test] - gem 'rails', '5.0.0.1' gem 'actioncable', '5.0.0.1' @@ -20,30 +17,22 @@ gem 'therubyracer', platforms: :ruby gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks', '~> 2.5' -# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 2.0' # bundle exec rake doc:rails generates the API under doc/api. gem 'sdoc', '~> 0.4.0', group: :doc # Enable deep clone of active record models gem 'deep_cloneable', '~> 2.2.1' -# Use ActiveModel has_secure_password -# gem 'bcrypt', '~> 3.1.7' - # Use Unicorn as the app server gem 'unicorn' -# Use Capistrano for deployment -# gem 'capistrano-rails', group: :development - # serializer gem 'active_model_serializers' -#haml +# haml gem 'haml-rails' -#bootstrap saas +# bootstrap saas gem 'bootstrap-sass', '~> 3.3.5' # Pagination @@ -51,9 +40,10 @@ gem 'will_paginate-bootstrap' # Decorators gem 'draper', '~> 3.0.0.pre1' + gem 'unicode_utils' -#Gestion des comptes utilisateurs +# Gestion des comptes utilisateurs gem 'devise' gem 'openid_connect' @@ -78,13 +68,13 @@ gem 'chartkick' gem 'logstasher' -gem "font-awesome-rails" +gem 'font-awesome-rails' gem 'hashie' gem 'mailjet' -gem "smart_listing" +gem 'smart_listing' gem 'bootstrap-wysihtml5-rails', '~> 0.3.3.8' @@ -92,7 +82,8 @@ gem 'as_csv' gem 'spreadsheet_architect' gem 'apipie-rails' -gem "maruku" # for Markdown support in apipie +# For Markdown support in apipie +gem 'maruku' gem 'openstack' @@ -114,10 +105,8 @@ group :test do gem 'launchy' gem 'factory_girl' gem 'database_cleaner' - gem 'selenium-webdriver' gem 'webmock' gem 'shoulda-matchers', require: false - gem 'simplecov', require: false gem 'poltergeist' gem 'timecop' gem 'guard' @@ -136,9 +125,6 @@ group :development do end group :development, :test do - # gem 'terminal-notifier' - # gem 'terminal-notifier-guard' - # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' gem 'pry-byebug' @@ -148,18 +134,11 @@ group :development, :test do gem 'spring-commands-rspec' gem 'rspec-rails', '~> 3.0' - gem 'railroady' - - gem 'rubocop', require: false - gem 'rubocop-checkstyle_formatter', require: false - gem 'rubocop-rspec', require: false - - gem 'parallel_tests', '~> 2.10' - - gem 'brakeman', require: false - # Deploy gem 'mina', ref: '343a7', git: 'https://github.com/mina-deploy/mina.git' + + # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' + gem 'dotenv-rails' end group :production, :staging do diff --git a/Gemfile.lock b/Gemfile.lock index f4b3f2758..6c78de68c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,7 +78,6 @@ GEM actionpack (>= 3.0) activemodel (>= 3.0) responders - ast (2.3.0) attr_required (1.0.1) autoprefixer-rails (6.5.4) execjs @@ -95,7 +94,6 @@ GEM sass (>= 3.3.4) bootstrap-wysihtml5-rails (0.3.3.8) railties (>= 3.0) - brakeman (3.4.1) browser (2.3.0) builder (3.2.2) byebug (9.0.6) @@ -113,8 +111,6 @@ GEM mime-types (>= 1.16) mimemagic (>= 0.3.0) chartkick (2.2.1) - childprocess (0.5.9) - ffi (~> 1.0, >= 1.0.11) clamav-client (3.1.0) cliver (0.3.2) coderay (1.1.1) @@ -140,7 +136,6 @@ GEM responders warden (~> 1.2.3) diff-lcs (1.2.5) - docile (1.1.5) domain_name (0.5.20161129) unf (>= 0.0.5, < 1.0.0) dotenv (2.2.0) @@ -339,9 +334,6 @@ GEM i18n (0.7.0) inflecto (0.0.2) ipaddress (0.8.3) - jbuilder (2.6.1) - activesupport (>= 3.0.0, < 5.1) - multi_json (~> 1.2) jquery-rails (4.2.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -420,17 +412,11 @@ GEM openstack (3.3.7) json orm_adapter (0.5.0) - parallel (1.10.0) - parallel_tests (2.10.0) - parallel - parser (2.3.3.1) - ast (~> 2.2) pg (0.19.0) poltergeist (1.12.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - powerpack (0.1.1) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -450,7 +436,6 @@ GEM rack (>= 1.1) rack-test (0.6.3) rack (>= 1.0) - railroady (1.5.2) rails (5.0.0.1) actioncable (= 5.0.0.1) actionmailer (= 5.0.0.1) @@ -478,7 +463,6 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) raindrops (0.17.0) rake (12.0.0) rb-fsevent (0.9.8) @@ -529,17 +513,6 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - rubocop (0.46.0) - parser (>= 2.3.1.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_dep (1.5.0) ruby_parser (3.8.3) sexp_processor (~> 4.1) @@ -563,10 +536,6 @@ GEM securecompare (1.0.0) select2-rails (4.0.3) thor (~> 0.14) - selenium-webdriver (3.0.3) - childprocess (~> 0.5) - rubyzip (~> 1.0) - websocket (~> 1.0) sentry-raven (2.2.0) faraday (>= 0.7.6, < 1.0) sexp_processor (4.7.0) @@ -585,11 +554,6 @@ GEM simple_form (3.4.0) actionpack (> 4, < 5.1) activemodel (> 4, < 5.1) - simplecov (0.12.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) slop (3.6.0) smart_listing (1.2.0) coffee-rails @@ -634,7 +598,6 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.1.2) unicode_utils (1.4.0) unicorn (5.2.0) kgio (~> 2.6) @@ -662,7 +625,6 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - websocket (1.2.3) websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) @@ -686,7 +648,6 @@ DEPENDENCIES bootstrap-datepicker-rails bootstrap-sass (~> 3.3.5) bootstrap-wysihtml5-rails (~> 0.3.3.8) - brakeman browser byebug capybara @@ -707,7 +668,6 @@ DEPENDENCIES guard-rspec haml-rails hashie - jbuilder (~> 2.0) jquery-rails launchy leaflet-draw-rails @@ -720,26 +680,20 @@ DEPENDENCIES newrelic_rpm openid_connect openstack - parallel_tests (~> 2.10) pg poltergeist pry-byebug rack-handlers - railroady rails (= 5.0.0.1) rails-controller-testing redis rest-client rgeo-geojson rspec-rails (~> 3.0) - rubocop - rubocop-checkstyle_formatter - rubocop-rspec sass-rails (~> 5.0) scenic sdoc (~> 0.4.0) select2-rails - selenium-webdriver sentry-raven shoulda-matchers sidekiq @@ -765,4 +719,4 @@ DEPENDENCIES xray-rails BUNDLED WITH - 1.14.4 + 1.14.6 diff --git a/app/controllers/demo_controller.rb b/app/controllers/demo_controller.rb index 89f1da027..5933c5735 100644 --- a/app/controllers/demo_controller.rb +++ b/app/controllers/demo_controller.rb @@ -6,7 +6,7 @@ class DemoController < ApplicationController return redirect_to root_path if Rails.env.production? smart_listing_create :procedures, - Procedure.where(archived: false, published: true), + Procedure.where(archived: false, published: true).order("id DESC"), partial: "demo/list", array: true end diff --git a/config/database.yml b/config/database.yml index 09ce42682..00832cfbc 100644 --- a/config/database.yml +++ b/config/database.yml @@ -13,4 +13,4 @@ test: adapter: sqlite3 pool: 5 timeout: 5000 - database: db/test<%= ENV['TEST_ENV_NUMBER'] %>.sqlite3 + database: db/test.sqlite3 diff --git a/doc/apipie_examples.json b/doc/apipie_examples.json index 968788243..e14456d96 100644 --- a/doc/apipie_examples.json +++ b/doc/apipie_examples.json @@ -86,6 +86,18 @@ } } ], + "champs_private": [ + { + "value": null, + "type_de_champ": { + "id": 1, + "libelle": "Description privée", + "type_champ": "text", + "order_place": 0, + "description": "description privée" + } + } + ], "pieces_justificatives": [ { "url": null, diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 4e7319f2a..f3b8d6030 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -19,12 +19,6 @@ ENV['RAILS_ENV'] ||= 'test' -if ENV['COV'] - require 'simplecov' - SimpleCov.start 'rails' - puts "required simplecov" -end - require File.expand_path('../../config/environment', __FILE__) require 'rspec/rails' require 'capybara/rspec' @@ -38,7 +32,7 @@ require 'capybara/poltergeist' Capybara.javascript_driver = :poltergeist Capybara.ignore_hidden_elements = false Capybara.register_driver :poltergeist do |app| - Capybara::Poltergeist::Driver.new(app, js_errors: true, port: 44_678 + ENV['TEST_ENV_NUMBER'].to_i, phantomjs_options: ['--proxy-type=none'], timeout: 180) + Capybara::Poltergeist::Driver.new(app, js_errors: true, port: 44_678, phantomjs_options: ['--proxy-type=none'], timeout: 180) end ActiveSupport::Deprecation.silenced = true