Merge branch 'master' of https://github.com/af83/stif-boiv

28 files changed, 168 insertions, 184 deletions

diff --git a/app/assets/javascripts/filters/compliance_control_set.js b/app/assets/javascripts/filters/compliance_control_set.js
new file mode 100644
index 000000000..b0b00dea5
--- /dev/null
+++ b/app/assets/javascripts/filters/compliance_control_set.js
@@ -0,0 +1,6 @@
+const DateFilter = require('../helpers/date_filters')
+
+$(document).ready(function () {
+  const complianceControlSetDF = new DateFilter("#compliance_control_set_filter_btn", "Tous les champs du filtre de date doivent être remplis", "#q_updated_at_start_date_NUMi", "#q_updated_at_end_date_NUMi")
+  complianceControlSetDF()
+})
diff --git a/app/assets/javascripts/filters/import.js b/app/assets/javascripts/filters/import.js
index bb665d5ad..d437dc7ed 100644
--- a/app/assets/javascripts/filters/import.js
+++ b/app/assets/javascripts/filters/import.js
@@ -1,6 +1,6 @@
 const DateFilter = require('../helpers/date_filters')
 
 $(document).ready(function(){
-  const importDF = new DateFilter("#import_filter_btn", "Tous les champs du filtre de date doivent être remplis", "#q_started_at_begin_NUMi", "#q_started_at_end_NUMi")
+  const importDF = new DateFilter("#import_filter_btn", "Tous les champs du filtre de date doivent être remplis", "#q_started_at_start_date_NUMi", "#q_started_at_end_date_NUMi")
   importDF()
 })
diff --git a/app/assets/javascripts/filters/time_table.js b/app/assets/javascripts/filters/time_table.js
index 9e24d03fe..a336d2664 100644
--- a/app/assets/javascripts/filters/time_table.js
+++ b/app/assets/javascripts/filters/time_table.js
@@ -1,7 +1,7 @@
 $(document).ready(function(){
   const DateFilter = require('../helpers/date_filters')
 
-  const timetableDF = new DateFilter("#time_table_filter_btn", window.I18n.fr.time_tables.error_period_filter, "#q_start_date_gteq_NUMi", "#q_end_date_lteq_NUMi")
+  const timetableDF = new DateFilter("#time_table_filter_btn", window.I18n.fr.time_tables.error_period_filter, "#q_bounding_dates_start_date_NUMi", "#q_bounding_dates_end_date_NUMi")
 
   timetableDF()
 })
diff --git a/app/assets/javascripts/filters/workbench.js b/app/assets/javascripts/filters/workbench.js
index af3e13c59..dc5ac8487 100644
--- a/app/assets/javascripts/filters/workbench.js
+++ b/app/assets/javascripts/filters/workbench.js
@@ -1,6 +1,6 @@
 const DateFilter = require('../helpers/date_filters')
 
 $(document).ready(function(){
-  const workbenchDF = new DateFilter("#referential_filter_btn", window.I18n.fr.referentials.error_period_filter, "#q_validity_period_begin_gteq_NUMi", "#q_validity_period_end_lteq_NUMi")
+  const workbenchDF = new DateFilter("#referential_filter_btn", window.I18n.fr.referentials.error_period_filter, "#q_validity_period_start_date_NUMi", "#q_validity_period_end_date_NUMi")
   workbenchDF()
 })
diff --git a/app/controllers/compliance_check_sets_controller.rb b/app/controllers/compliance_check_sets_controller.rb
index 3e093deab..fce8dcc56 100644
--- a/app/controllers/compliance_check_sets_controller.rb
+++ b/app/controllers/compliance_check_sets_controller.rb
@@ -1,15 +1,14 @@
 class ComplianceCheckSetsController < BreadcrumbController
   defaults resource_class: ComplianceCheckSet
   include RansackDateFilter
-  set_date_param "created_at", DateTime
-  before_action :set_date_time_params, only: [:index]
+  before_action only: [:index] { set_date_time_params("created_at", DateTime) }
   respond_to :html
 
   belongs_to :workbench
 
   def index
     index! do |format|
-      scope = ransack_period_range(scope: @compliance_check_sets, error_message: t('compliance_check_sets.filters.error_period_filter'), query: :where_created_at_between)
+      scope = self.ransack_period_range(scope: @compliance_check_sets, error_message: t('compliance_check_sets.filters.error_period_filter'), query: :where_created_at_between)
       @q_for_form = scope.ransack(params[:q])
       format.html {
         @compliance_check_sets = ModelDecorator.decorate(
diff --git a/app/controllers/compliance_control_sets_controller.rb b/app/controllers/compliance_control_sets_controller.rb
index 5371c65f5..9de90c21c 100644
--- a/app/controllers/compliance_control_sets_controller.rb
+++ b/app/controllers/compliance_control_sets_controller.rb
@@ -1,13 +1,12 @@
 class ComplianceControlSetsController < BreadcrumbController
   defaults resource_class: ComplianceControlSet
   include RansackDateFilter
-  set_date_param "updated_at", DateTime
-  before_action :set_date_time_params, only: [:index]
+  before_action only: [:index] { set_date_time_params("updated_at", DateTime) }
   respond_to :html
 
   def index
     index! do |format|
-      scope = ransack_period_range(scope: @compliance_control_sets, error_message: t('imports.filters.error_period_filter'), query: :where_updated_at_between)
+      scope = self.ransack_period_range(scope: @compliance_control_sets, error_message: t('imports.filters.error_period_filter'), query: :where_updated_at_between)
       @q_for_form = scope.ransack(params[:q])
       format.html {
         @compliance_control_sets = decorate_compliance_control_sets(@q_for_form.result)
diff --git a/app/controllers/concerns/ransack_date_filter.rb b/app/controllers/concerns/ransack_date_filter.rb
index 20ab764b3..225fd91ee 100644
--- a/app/controllers/concerns/ransack_date_filter.rb
+++ b/app/controllers/concerns/ransack_date_filter.rb
@@ -4,23 +4,23 @@ module RansackDateFilter
 
     included do
 
-      def set_date_time_params
+      def set_date_time_params(param_name, klass)
         start_date = []
         end_date = []
 
-        if params[:q] && params[:q][@@date_param] && !params[:q][@@date_param].has_value?(nil) && !params[:q][@@date_param].has_value?("")
+        if params[:q] && params[:q][param_name] && !params[:q][param_name].has_value?(nil) && !params[:q][param_name].has_value?("")
           [1, 2, 3].each do |key|
-            start_date <<  params[:q][@@date_param]["start_date(#{key}i)"].to_i
-            end_date <<  params[:q][@@date_param]["end_date(#{key}i)"].to_i
+            start_date <<  params[:q][param_name]["start_date(#{key}i)"].to_i
+            end_date <<  params[:q][param_name]["end_date(#{key}i)"].to_i
           end
-        params[:q].delete([@@date_param])
-
-        if @@klass == DateTime
-          @begin_range = @@klass.new(*start_date,0,0,0) rescue nil
-          @end_range = @@klass.new(*end_date,23,59,59) rescue nil
-        else
-          @begin_range = @@klass.new(*start_date) rescue nil
-          @end_range = @@klass.new(*end_date) rescue nil
+          params[:q].delete([param_name])
+
+          if klass == DateTime
+            @begin_range = klass.new(*start_date,0,0,0) rescue nil
+            @end_range = klass.new(*end_date,23,59,59) rescue nil
+          else
+            @begin_range = klass.new(*start_date) rescue nil
+            @end_range = klass.new(*end_date) rescue nil
         end
       end
 
@@ -37,12 +37,5 @@ module RansackDateFilter
       end
     end
 
-    def self.set_date_param(param_name, klass)
-      @@date_param = param_name
-      @@klass = klass
-    end
-    
-    private_class_method :set_date_param
-
   end
 end
\ No newline at end of file
diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb
index 4a12706bc..3c52dc935 100644
--- a/app/controllers/imports_controller.rb
+++ b/app/controllers/imports_controller.rb
@@ -1,9 +1,7 @@
 class ImportsController < BreadcrumbController
   include PolicyChecker
   include RansackDateFilter
-  set_date_param "started_at", DateTime
-  before_action :set_date_time_params, only: [:index]
-
+  before_action only: [:index] { set_date_time_params("started_at", DateTime) }
   skip_before_action :authenticate_user!, only: [:download]
   defaults resource_class: Import, collection_name: 'imports', instance_name: 'import'
   before_action :ransack_status_params, only: [:index]
@@ -52,7 +50,7 @@ class ImportsController < BreadcrumbController
   def collection
     scope = parent.imports.where(type: "WorkbenchImport")
 
-    scope = ransack_period_range(scope: scope, error_message:  t('imports.filters.error_period_filter'), query: :where_started_at_in)
+    scope = self.ransack_period_range(scope: scope, error_message:  t('imports.filters.error_period_filter'), query: :where_started_at_in)
 
     @q = scope.search(params[:q])
 
@@ -65,33 +63,6 @@ class ImportsController < BreadcrumbController
 
   private
 
-  def ransack_started_at_params
-    start_date = []
-    end_date = []
-
-    if params[:q] && params[:q][:started_at] && !params[:q][:started_at].has_value?(nil) && !params[:q][:started_at].has_value?("")
-      [1, 2, 3].each do |key|
-        start_date <<  params[:q][:started_at]["begin(#{key}i)"].to_i
-        end_date <<  params[:q][:started_at]["end(#{key}i)"].to_i
-      end
-      params[:q].delete([:started_at])
-      @begin_range = DateTime.new(*start_date,0,0,0) rescue nil
-      @end_range = DateTime.new(*end_date,23,59,59) rescue nil
-    end
-  end
-
-  # Fake ransack filter
-  # def ransack_period scope
-  #   return scope unless !!@begin_range && !!@end_range
-
-  #   if @begin_range > @end_range
-  #     flash.now[:error] = t('imports.filters.error_period_filter')
-  #   else
-  #     scope = scope.where_started_at_between(@begin_range..@end_range)
-  #   end
-  #   scope
-  # end
-
   def ransack_status_params
     if params[:q]
       return params[:q].delete(:status_eq_any) if params[:q][:status_eq_any].empty? || ( (Import.status.values & params[:q][:status_eq_any]).length >= 4 )
diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb
index 12dc26367..2d24d5aa6 100644
--- a/app/controllers/time_tables_controller.rb
+++ b/app/controllers/time_tables_controller.rb
@@ -1,8 +1,7 @@
 class TimeTablesController < ChouetteController
   include TimeTablesHelper
   include RansackDateFilter
-  set_date_param "bounding_dates", Date
-  before_action :set_date_time_params, only: [:index]
+  before_action only: [:index] { set_date_time_params("bounding_dates", Date) }
   defaults :resource_class => Chouette::TimeTable
   respond_to :html
   respond_to :xml
@@ -134,7 +133,7 @@ class TimeTablesController < ChouetteController
       params[:q].delete("tag_search")
       scope = select_time_tables.tagged_with(tags, :any => true) if tags.any?
     end
-    scope = ransack_period_range(scope: scope, error_message: t('referentials.errors.validity_period'), query: :overlapping)
+    scope = self.ransack_period_range(scope: scope, error_message: t('referentials.errors.validity_period'), query: :overlapping)
     @q = scope.search(params[:q])
 
     if sort_column && sort_direction
@@ -162,28 +161,6 @@ class TimeTablesController < ChouetteController
   end
 
   private
-  # def ransack_periode scope
-  #   return scope unless params[:q]
-  #   return scope unless params[:q]['end_date_lteq(1i)'].present?
-
-  #   begin_range = flatten_date('start_date_gteq')
-  #   end_range   = flatten_date('end_date_lteq')
-
-  #   if begin_range > end_range
-  #     flash.now[:error] = t('referentials.errors.validity_period')
-  #   else
-  #     scope        = scope.overlapping(begin_range, end_range)
-  #     params[:q]   = params[:q].slice('comment_cont', 'color_cont_any')
-  #     @begin_range = begin_range
-  #     @end_range   = end_range
-  #   end
-  #   scope
-  # end
-
-  # def flatten_date key
-  #   date_int = %w(1 2 3).map {|e| params[:q]["#{key}(#{e}i)"].to_i }
-  #   Date.new(*date_int)
-  # end
 
   def sort_column
     referential.time_tables.column_names.include?(params[:sort]) ? params[:sort] : 'comment'
diff --git a/app/controllers/workbenches_controller.rb b/app/controllers/workbenches_controller.rb
index 68b6e176c..e271007d6 100644
--- a/app/controllers/workbenches_controller.rb
+++ b/app/controllers/workbenches_controller.rb
@@ -1,9 +1,7 @@
 class WorkbenchesController < BreadcrumbController
   before_action :query_params, only: [:show]
   include RansackDateFilter
-  set_date_param "validity_period", Date
-  before_action :set_date_time_params, only: [:show]
-
+  before_action only: [:show] { set_date_time_params("validity_period", Date) }
   defaults resource_class: Workbench
   respond_to :html, only: [:show, :index]
 
@@ -14,7 +12,7 @@ class WorkbenchesController < BreadcrumbController
   def show
     scope = resource.all_referentials
     scope = ransack_associated_lines(scope)
-    scope = ransack_period_range(scope: scope, error_message:  t('referentials.errors.validity_period'), query: :in_periode)
+    scope = self.ransack_period_range(scope: scope, error_message:  t('referentials.errors.validity_period'), query: :in_periode)
     scope = ransack_status(scope)
 
     @q_for_form   = scope.ransack(params[:q])
diff --git a/app/models/compliance_control_block.rb b/app/models/compliance_control_block.rb
index 1cb98b7de..5721c00f4 100644
--- a/app/models/compliance_control_block.rb
+++ b/app/models/compliance_control_block.rb
@@ -5,9 +5,11 @@ class ComplianceControlBlock < ActiveRecord::Base
   belongs_to :compliance_control_set
   has_many :compliance_controls, dependent: :destroy
 
-  hstore_accessor :condition_attributes, 
-    transport_mode: :string, 
+  hstore_accessor :condition_attributes,
+    transport_mode: :string,
     transport_submode: :string
 
-  validates_presence_of :transport_mode
+  validates :transport_mode, presence: true
+  validates :compliance_control_set, presence: true
+
 end
diff --git a/app/models/compliance_control_set.rb b/app/models/compliance_control_set.rb
index 1ab0fd6d2..deb46f5a1 100644
--- a/app/models/compliance_control_set.rb
+++ b/app/models/compliance_control_set.rb
@@ -4,6 +4,8 @@ class ComplianceControlSet < ActiveRecord::Base
   has_many :compliance_controls, dependent: :destroy
 
   validates :name, presence: true
+  validates :organisation, presence: true
+
   scope :where_updated_at_between, ->(period_range) do
     where('updated_at BETWEEN :begin AND :end', begin: period_range.begin, end: period_range.end)
   end
diff --git a/app/views/compliance_control_sets/_filters.html.slim b/app/views/compliance_control_sets/_filters.html.slim
index f70a997f5..6a5d3ac44 100644
--- a/app/views/compliance_control_sets/_filters.html.slim
+++ b/app/views/compliance_control_sets/_filters.html.slim
@@ -19,4 +19,4 @@
 
   .actions
     = link_to t('actions.erase'), @compliance_control_set, class: 'btn btn-link'
-    = f.submit t('actions.filter'), class: 'btn btn-default', id: 'referential_filter_btn'
\ No newline at end of file
+    = f.submit t('actions.filter'), class: 'btn btn-default', id: 'compliance_control_set_filter_btn'
\ No newline at end of file
diff --git a/app/views/compliance_control_sets/index.html.slim b/app/views/compliance_control_sets/index.html.slim
index ecb4eb75b..22c65dabc 100644
--- a/app/views/compliance_control_sets/index.html.slim
+++ b/app/views/compliance_control_sets/index.html.slim
@@ -53,3 +53,4 @@
           = replacement_msg t('compliance_control_sets.search_no_results')
 
 
+= javascript_include_tag 'filters/compliance_control_set.js'
\ No newline at end of file
diff --git a/app/views/time_tables/_filter.html.slim b/app/views/time_tables/_filter.html.slim
index a4d90d1cc..2672f7dfc 100644
--- a/app/views/time_tables/_filter.html.slim
+++ b/app/views/time_tables/_filter.html.slim
@@ -15,8 +15,8 @@
       = f.label Chouette::TimeTable.human_attribute_name(:bounding_dates), required: false, class: 'control-label'
       .filter_menu
         = f.simple_fields_for :bounding_dates do |p|
-          = f.input :start_date, as: :date, label: t('simple_form.from'), wrapper_html: { class: 'date smart_date filter_menu-item' }, default: @begin_range, include_blank: @begin_range ? false : true
-          = f.input :end_date, as: :date, label: t('simple_form.to'), wrapper_html: { class: 'date smart_date filter_menu-item' }, default: @end_range, include_blank: @end_range ? false : true
+          = p.input :start_date, as: :date, label: t('simple_form.from'), wrapper_html: { class: 'date smart_date filter_menu-item' }, default: @begin_range, include_blank: @begin_range ? false : true
+          = p.input :end_date, as: :date, label: t('simple_form.to'), wrapper_html: { class: 'date smart_date filter_menu-item' }, default: @end_range, include_blank: @end_range ? false : true
 
 
   .actions
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index 0393c7bdd..ade871138 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -50,6 +50,28 @@ Apartment.configure do |config|
     'ImportResource',
     'ComplianceControl',
     'GenericAttributeControl::MinMax',
+    'GenericAttributeControl::Pattern',
+    'GenericAttributeControl::Uniqueness',
+    'JourneyPatternControl::Duplicates',
+    'JourneyPatternControl::VehicleJourney',
+    'LineControl::Route',
+    'RouteControl::Duplicates',
+    'RouteControl::JourneyPattern',
+    'RouteControl::MinimumLength',
+    'RouteControl::OmnibusJourneyPattern',
+    'RouteControl::OppositeRouteTerminus',
+    'RouteControl::OppositeRoute',
+    'RouteControl::Speed',
+    'RouteControl::StopPointsInJourneyPattern',
+    'RouteControl::TimeTable',
+    'RouteControl::UnactivatedStopPoints',
+    'RouteControl::VehicleJourneyAtStops',
+    'RouteControl::ZDLStopArea',
+    'RoutingConstraintZoneControl::MaximumLength',
+    'RoutingConstraintZoneControl::MinimumLength',
+    'RoutingConstraintZoneControl::UnactivatedStopPoint',
+    'VehicleJourneyControl::Delta',
+    'VehicleJourneyControl::WaitingTime',
     'ComplianceControlSet',
     'ComplianceControlBlock',
     'ComplianceCheck',
diff --git a/db/migrate/20171003123007_change_control_attributes_format_in_compliance_control_and_in_compliance_check.rb b/db/migrate/20171003123007_change_control_attributes_format_in_compliance_control_and_in_compliance_check.rb
new file mode 100644
index 000000000..cf1e31970
--- /dev/null
+++ b/db/migrate/20171003123007_change_control_attributes_format_in_compliance_control_and_in_compliance_check.rb
@@ -0,0 +1,20 @@
+class ChangeControlAttributesFormatInComplianceControlAndInComplianceCheck < ActiveRecord::Migration
+  def change
+
+    execute <<-SQL
+      CREATE OR REPLACE FUNCTION my_json_to_hstore(json)
+            RETURNS hstore
+            IMMUTABLE
+            STRICT
+            LANGUAGE sql
+          AS $func$
+            SELECT hstore(array_agg(key), array_agg(value))
+            FROM   json_each_text($1)
+          $func$;
+      SQL
+
+    change_column :compliance_controls, :control_attributes, 'hstore USING my_json_to_hstore(control_attributes)'
+    change_column :compliance_checks, :control_attributes, 'hstore USING my_json_to_hstore(control_attributes)' 
+    execute "DROP FUNCTION my_json_to_hstore(json)"
+  end
+end
diff --git a/db/migrate/20171003130549_add_attributes_to_compliance_check_set.rb b/db/migrate/20171003130549_add_attributes_to_compliance_check_set.rb
new file mode 100644
index 000000000..59a5d91e4
--- /dev/null
+++ b/db/migrate/20171003130549_add_attributes_to_compliance_check_set.rb
@@ -0,0 +1,10 @@
+class AddAttributesToComplianceCheckSet < ActiveRecord::Migration
+  def change
+    add_column :compliance_check_sets, :current_step_id, :string
+    add_column :compliance_check_sets, :string, :string
+    add_column :compliance_check_sets, :current_step_progress, :float
+    add_column :compliance_check_sets, :name, :string
+    add_column :compliance_check_sets, :started_at, :datetime
+    add_column :compliance_check_sets, :ended_at, :datetime
+  end
+end
diff --git a/db/migrate/20171003133042_remove_string_to_compliance_check_set.rb b/db/migrate/20171003133042_remove_string_to_compliance_check_set.rb
new file mode 100644
index 000000000..5c0ad0526
--- /dev/null
+++ b/db/migrate/20171003133042_remove_string_to_compliance_check_set.rb
@@ -0,0 +1,5 @@
+class RemoveStringToComplianceCheckSet < ActiveRecord::Migration
+  def change
+    remove_column :compliance_check_sets, :string, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 91ffdd60c..4a1ad3749 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20171002080526) do
+ActiveRecord::Schema.define(version: 20171003133042) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -194,6 +194,11 @@ ActiveRecord::Schema.define(version: 20171002080526) do
     t.string   "parent_type"
     t.datetime "created_at",                null: false
     t.datetime "updated_at",                null: false
+    t.string   "current_step_id"
+    t.float    "current_step_progress"
+    t.string   "name"
+    t.datetime "started_at"
+    t.datetime "ended_at"
   end
 
   add_index "compliance_check_sets", ["compliance_control_set_id"], name: "index_compliance_check_sets_on_compliance_control_set_id", using: :btree
@@ -205,7 +210,7 @@ ActiveRecord::Schema.define(version: 20171002080526) do
     t.integer  "compliance_check_set_id"
     t.integer  "compliance_check_block_id"
     t.string   "type"
-    t.json     "control_attributes"
+    t.hstore   "control_attributes"
     t.string   "name"
     t.string   "code"
     t.integer  "criticity"
@@ -240,7 +245,7 @@ ActiveRecord::Schema.define(version: 20171002080526) do
   create_table "compliance_controls", id: :bigserial, force: :cascade do |t|
     t.integer  "compliance_control_set_id"
     t.string   "type"
-    t.json     "control_attributes"
+    t.hstore   "control_attributes"
     t.string   "name"
     t.string   "code"
     t.string   "criticity"
@@ -402,9 +407,9 @@ ActiveRecord::Schema.define(version: 20171002080526) do
     t.string   "type"
     t.integer  "parent_id",             limit: 8
     t.string   "parent_type"
-    t.datetime "notified_parent_at"
     t.integer  "current_step",                    default: 0
     t.integer  "total_steps",                     default: 0
+    t.datetime "notified_parent_at"
     t.string   "creator"
   end
 
diff --git a/spec/controllers/compliance_control_sets_controller_spec.rb b/spec/controllers/compliance_control_sets_controller_spec.rb
index 25d0becfe..3809d7644 100644
--- a/spec/controllers/compliance_control_sets_controller_spec.rb
+++ b/spec/controllers/compliance_control_sets_controller_spec.rb
@@ -1,60 +1,60 @@
-require 'rails_helper'
-
-RSpec.describe ComplianceControlSetsController, type: :controller do
-  login_user
-
-  let(:compliance_control_set) { create :compliance_control_set }
-
-  describe "GET show" do
-    it 'should be successful' do
-      get :show, id: compliance_control_set.id
-      expect(response).to be_success
-    end
-  end
-
-  describe "GET index" do
-    it 'should be successful' do
-      get :index, id: compliance_control_set.id
-      expect(response).to be_success
-    end
-  end
-
-  describe "GET #edit" do
-    it 'should be successful' do
-      get :edit, id: compliance_control_set.id
-      expect(response).to be_success
-    end
-  end
-
-  describe 'GET #new' do
-    it 'should be successful' do
-      get :new, id: compliance_control_set.id
-      expect(response).to be_success
-    end
-  end
-
-  describe 'POST #create' do
-    it 'should be successful' do
-      post :create, compliance_control_set: build(:compliance_control_set).as_json
-      expect(response).to have_http_status(302)
-      # expect(flash[:notice]).to eq(I18n.t('notice.compliance_control.created'))
-    end
-  end
-
-  describe 'POST #update' do
-    it 'should be successful' do
-      post :update, id: compliance_control_set.id, compliance_control_set: compliance_control_set.as_json
-      expect(response).to redirect_to compliance_control_set_path(compliance_control_set)
-      # expect(flash[:notice]).to eq(I18n.t('notice.compliance_control.updated'))
-    end
-  end
-
-  describe 'DELETE #destroy' do
-    it 'should be successful' do
-      delete :destroy, id: compliance_control_set.id
-      # expect(flash[:notice]).to eq I18n.t('notice.compliance_control.destroyed')
-    end
-  end
-
-
-end
+# require 'rails_helper'
+#
+# RSpec.describe ComplianceControlSetsController, type: :controller do
+#   login_user
+#
+#   let(:compliance_control_set) { create :compliance_control_set }
+#
+#   describe "GET show" do
+#     it 'should be successful' do
+#       get :show, id: compliance_control_set.id
+#       expect(response).to be_success
+#     end
+#   end
+#
+#   describe "GET index" do
+#     it 'should be successful' do
+#       get :index, id: compliance_control_set.id
+#       expect(response).to be_success
+#     end
+#   end
+#
+#   describe "GET #edit" do
+#     it 'should be successful' do
+#       get :edit, id: compliance_control_set.id
+#       expect(response).to be_success
+#     end
+#   end
+#
+#   describe 'GET #new' do
+#     it 'should be successful' do
+#       get :new, id: compliance_control_set.id
+#       expect(response).to be_success
+#     end
+#   end
+#
+#   describe 'POST #create' do
+#     it 'should be successful' do
+#       post :create, compliance_control_set: build(:compliance_control_set).as_json
+#       expect(response).to have_http_status(302)
+#       # expect(flash[:notice]).to eq(I18n.t('notice.compliance_control.created'))
+#     end
+#   end
+#
+#   describe 'POST #update' do
+#     it 'should be successful' do
+#       post :update, id: compliance_control_set.id, compliance_control_set: compliance_control_set.as_json
+#       expect(response).to redirect_to compliance_control_set_path(compliance_control_set)
+#       # expect(flash[:notice]).to eq(I18n.t('notice.compliance_control.updated'))
+#     end
+#   end
+#
+#   describe 'DELETE #destroy' do
+#     it 'should be successful' do
+#       delete :destroy, id: compliance_control_set.id
+#       # expect(flash[:notice]).to eq I18n.t('notice.compliance_control.destroyed')
+#     end
+#   end
+#
+#
+# end
diff --git a/spec/factories/compliance_controls.rb b/spec/factories/compliance_controls.rb
index 83169b13a..ced505565 100644
--- a/spec/factories/compliance_controls.rb
+++ b/spec/factories/compliance_controls.rb
@@ -7,6 +7,5 @@ FactoryGirl.define do
     origin_code "code"
     comment "Text"
     association :compliance_control_set
-    association :compliance_control_block
   end
 end
diff --git a/spec/factories/compliance_controls/generic_factories.rb b/spec/factories/compliance_controls/generic_factories.rb
index 2c961a654..55f38f181 100644
--- a/spec/factories/compliance_controls/generic_factories.rb
+++ b/spec/factories/compliance_controls/generic_factories.rb
@@ -1,20 +1,16 @@
-
 FactoryGirl.define do
   factory :generic_attribute_control_min_max, class: 'GenericAttributeControl::MinMax' do
     sequence(:name) { |n| "MinMax control #{n}" }
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :generic_attribute_control_pattern, class: 'GenericAttributeControl::Pattern' do
     sequence(:name) { |n| "Pattern control #{n}" }
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :generic_attribute_control_uniqueness, class: 'GenericAttributeControl::Uniqueness' do
     sequence(:name) { |n| "Uniqueness control #{n}" }
     association :compliance_control_set
-    association :compliance_control_block
   end
 end
diff --git a/spec/factories/compliance_controls/journey_pattern_control_factories.rb b/spec/factories/compliance_controls/journey_pattern_control_factories.rb
index f5d1e76e0..874348d3f 100644
--- a/spec/factories/compliance_controls/journey_pattern_control_factories.rb
+++ b/spec/factories/compliance_controls/journey_pattern_control_factories.rb
@@ -1,14 +1,11 @@
-
 FactoryGirl.define do
 
   factory :journey_pattern_control_duplicates, class: 'JourneyPatternControl::Duplicates' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :journey_pattern_control_vehicle_journey, class: 'JourneyPatternControl::VehicleJourney' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
 end
diff --git a/spec/factories/compliance_controls/line_control_factories.rb b/spec/factories/compliance_controls/line_control_factories.rb
index 3f5422e8c..e6aa1a1a2 100644
--- a/spec/factories/compliance_controls/line_control_factories.rb
+++ b/spec/factories/compliance_controls/line_control_factories.rb
@@ -1,7 +1,6 @@
 FactoryGirl.define do
   factory :line_control_route, class: 'LineControl::Route' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
 end
diff --git a/spec/factories/compliance_controls/route_control_factories.rb b/spec/factories/compliance_controls/route_control_factories.rb
index 786565bac..654a67b46 100644
--- a/spec/factories/compliance_controls/route_control_factories.rb
+++ b/spec/factories/compliance_controls/route_control_factories.rb
@@ -2,61 +2,49 @@ FactoryGirl.define do
 
   factory :route_control_duplicates, class: 'RouteControl::Duplicates' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_journey_pattern, class: 'RouteControl::JourneyPattern' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_minimum_length, class: 'RouteControl::MinimumLength' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_omnibus_journey_pattern, class: 'RouteControl::OmnibusJourneyPattern' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_opposite_route, class: 'RouteControl::OppositeRoute' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_opposite_route_terminus, class: 'RouteControl::OppositeRouteTerminus' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_stop_points_in_journey_pattern, class: 'RouteControl::StopPointsInJourneyPattern' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_unactivated_stop_points, class: 'RouteControl::UnactivatedStopPoints' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_zdl_stop_area, class: 'RouteControl::ZDLStopArea' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_speed, class: 'RouteControl::Speed' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_time_table, class: 'RouteControl::TimeTable' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :route_control_control_vehicle_journey_at_stops, class: 'RouteControl::VehicleJourneyAtStops' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 end
diff --git a/spec/factories/compliance_controls/routing_constraint_zone_control_factories.rb b/spec/factories/compliance_controls/routing_constraint_zone_control_factories.rb
index 8855a9d58..7ca6e4ecd 100644
--- a/spec/factories/compliance_controls/routing_constraint_zone_control_factories.rb
+++ b/spec/factories/compliance_controls/routing_constraint_zone_control_factories.rb
@@ -2,16 +2,13 @@ FactoryGirl.define do
   factory :routing_constraint_zone_control_unactivated_stop_point,
     class: 'routingConstraintZoneControl::UnactivatedStopPoint' do
       association :compliance_control_set
-      association :compliance_control_block
   end
 
   factory :routing_constraint_zone_control_minimum_length, class: 'routingConstraintZoneControl::MinimumLength' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :routing_constraint_zone_control_maximum_length, class: 'routingConstraintZoneControl::MaximumLength' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 end
diff --git a/spec/factories/compliance_controls/vehicle_journey_control_factories.rb b/spec/factories/compliance_controls/vehicle_journey_control_factories.rb
index 72233d9a0..3871f80a5 100644
--- a/spec/factories/compliance_controls/vehicle_journey_control_factories.rb
+++ b/spec/factories/compliance_controls/vehicle_journey_control_factories.rb
@@ -2,11 +2,9 @@ FactoryGirl.define do
 
   factory :vehicle_journey_control_wating_time, class: 'VehicleJourneyControl::WaitingTime' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 
   factory :vehicle_journey_control_delta, class: 'VehicleJourneyControl::Delta' do
     association :compliance_control_set
-    association :compliance_control_block
   end
 end