Merge branch 'release/0.17.5.2'

Gemfile

@@ -74,7 +74,6 @@ gem 'youtube_addy'
 
 group :development, :test do
   gem 'byebug'
-  gem 'foreman'
   gem 'web-console', '2.0.0.beta2'
   gem 'spring', '1.3.4'
   gem 'factory_girl_rails'
@@ -86,8 +85,8 @@ group :development, :test do
 end
 
 group :test do
-  gem 'simplecov', require: false
-  gem 'tconsole', github: 'ulmic/tconsole', branch: 'rails4'
-  gem 'coveralls', require: false
+  gem 'simplecov', '>= 0.14.1', require: false
+  gem 'tconsole-rails4'
+  gem 'coveralls', '>= 0.8.20', require: false
   gem 'webmock'
 end

Gemfile.lock

@@ -58,16 +58,6 @@ GIT
   specs:
     state_machine (1.2.0)
 
-GIT
-  remote: git://github.com/ulmic/tconsole.git
-  revision: daccf66423f2c2d222b27cced463762e08de56b6
-  branch: rails4
-  specs:
-    tconsole (2.2.0.pre)
-      ansi
-      chattyproc (~> 1.0.0)
-      term-ansicolor (~> 1.0.7)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -164,12 +154,12 @@ GEM
     concurrent-ruby (1.0.0)
     configus (0.0.5)
     connection_pool (2.2.0)
-    coveralls (0.7.1)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
+    coveralls (0.8.20)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.14.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     debug_inspector (0.0.2)
@@ -182,8 +172,6 @@ GEM
       representable (>= 2.4.0, <= 3.1.0)
       uber
     docile (1.1.5)
-    domain_name (0.5.25)
-      unf (>= 0.0.5, < 1.0.0)
     draper (2.1.0)
       actionpack (>= 3.0)
       activemodel (>= 3.0)
@@ -205,8 +193,6 @@ GEM
       faraday (>= 0.7.4, < 0.10)
     font-awesome-rails (4.7.0.1)
       railties (>= 3.2, < 5.1)
-    foreman (0.78.0)
-      thor (~> 0.19.1)
     foundation-rails (5.5.2.1)
       railties (>= 3.1.0)
       sass (>= 3.3.0, < 3.5)
@@ -235,8 +221,6 @@ GEM
       haml (~> 4.0.0)
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
     i18n (0.7.0)
     ice_nine (0.11.1)
     jasny_bootstrap_extension_rails (0.0.1)
@@ -274,7 +258,6 @@ GEM
     multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    netrc (0.11.0)
     nokogiri (1.6.7)
       mini_portile2 (~> 2.0.0.rc2)
     oauth (0.4.7)
@@ -373,10 +356,6 @@ GEM
     request_store (1.2.1)
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
     rmagick (2.15.3)
     ruby-ole (1.2.12)
     ruby_parser (3.7.2)
@@ -410,9 +389,9 @@ GEM
     simple_form (3.2.0)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
-    simplecov (0.11.1)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     sinatra (1.4.6)
@@ -439,14 +418,20 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
+    tconsole-rails4 (2.2.0)
+      ansi
+      chattyproc (~> 1.0.0)
+      term-ansicolor (~> 1.3)
     temple (0.7.6)
-    term-ansicolor (1.0.7)
+    term-ansicolor (1.5.0)
+      tins (~> 1.0)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
-    thor (0.19.1)
+    thor (0.19.4)
     thread_safe (0.3.5)
     tilt (2.0.1)
+    tins (1.13.2)
     trap (1.0.0)
     turbolinks (2.5.3)
       coffee-rails
@@ -455,9 +440,6 @@ GEM
     uber (0.0.15)
     uglifier (3.0.0)
       execjs (>= 0.3.0, < 3)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
     unicode_utils (1.4.0)
     unicorn (5.0.1)
       kgio (~> 2.6)
@@ -507,12 +489,11 @@ DEPENDENCIES
   coffee-rails (~> 4.1.0)
   colorize (= 0.6.0)
   configus
-  coveralls
+  coveralls (>= 0.8.20)
   draper
   enumerize
   factory_girl_rails
   font-awesome-rails (= 4.7.0.1)
-  foreman
   foundation-rails (= 5.5.2.1)
   foursquare2!
   github_api
@@ -556,11 +537,11 @@ DEPENDENCIES
   select2-rails
   sidekiq
   simple_form
-  simplecov
+  simplecov (>= 0.14.1)
   sinatra (>= 1.3.0)
   spring (= 1.3.4)
   state_machine!
-  tconsole!
+  tconsole-rails4
   therubyracer
   trap (~> 1)
   uglifier (>= 1.3.0)
@@ -577,4 +558,4 @@ RUBY VERSION
    ruby 2.3.0p0
 
 BUNDLED WITH
-   1.14.3
+   1.14.6

app/forms/team/departament_form.rb

@@ -1,3 +1,3 @@
-class Team::DepartamentForm < ActiveForm::Base
-  # attributes :name, :email
+class Team::DepartamentForm < ApplicationReform
+  properties :title, :municipality
 end

app/models/concerns/action_logger_managment.rb

@@ -18,8 +18,7 @@ def feeds
     private
 
     def logged_actions_list
-      type == 'Questionary' ? as_record_logged_actions : logged_actions
+      try(:type) && type == 'Questionary' ? as_record_logged_actions : logged_actions
     end
-
   end
 end

test/controllers/web/admin/teams_controller_test.rb

@@ -49,7 +49,7 @@ class Web::Admin::TeamsControllerTest < ActionController::TestCase
     assert_redirected_to admin_teams_path
     team = Team.last
     team.attributes.keys.except(*@exceptions_attributes).each do |key|
-      assert_equal attributes[key.to_sym], team.send(key), key
+      assert_equal attributes[key.to_sym], team.send(key), "Attribute #{key}. Team type #{team.type}"
     end
   end
 

test/factories/categories.rb

@@ -3,6 +3,7 @@
     name { generate :string }
     parent_id { Category.last ? Category.last.id : nil }
     state { Category.state_machines[:state].states.map(&:name).first.to_s }
+    id { Category.maximum(:id) + 1 }
 
     trait :contacts do
       name 'Контакты'

test/factories/teams.rb

@@ -6,6 +6,7 @@
     state { Team.state_machines[:state].states.map(&:name).first.to_s }
     publicity { Team.publicity.values.first }
     type { [ 'Team::Departament', 'Team::Primary', 'Team::Committee', 'Team::Subdivision', 'Team::Administration'].sample }
+    municipality { Team::Departament.municipality.values.sample }
   end
 
   factory :departament, parent: :team, class: 'Team::Departament' do