Rebase master and resolve conflicts

16 files changed, 18 insertions, 18 deletions

diff --git a/spec/features/line_footnotes_permissions_spec.rb b/spec/features/line_footnotes_permissions_spec.rb
index deac8e8fc..62adbfcd5 100644
--- a/spec/features/line_footnotes_permissions_spec.rb
+++ b/spec/features/line_footnotes_permissions_spec.rb
@@ -10,7 +10,7 @@ describe 'Line Footnotes', type: :feature do
 
   describe 'permissions' do
     before do
-      allow_any_instance_of(Chouette::LinePolicy).to receive(:update_footnote?).and_return permission
+      allow_any_instance_of(LinePolicy).to receive(:update_footnote?).and_return permission
       visit path
     end
 
diff --git a/spec/features/lines_permissions_spec.rb b/spec/features/lines_permissions_spec.rb
index 903868fae..5d53d6568 100644
--- a/spec/features/lines_permissions_spec.rb
+++ b/spec/features/lines_permissions_spec.rb
@@ -13,8 +13,8 @@ describe "Lines", :type => :feature do
       create :group_of_line
       line_referential.lines << line
       line_referential.organisations << Organisation.first
-      allow_any_instance_of(Chouette::LinePolicy).to receive(:create?).and_return permission
-      allow_any_instance_of(Chouette::LinePolicy).to receive(:destroy?).and_return permission
+      allow_any_instance_of(LinePolicy).to receive(:create?).and_return permission
+      allow_any_instance_of(LinePolicy).to receive(:destroy?).and_return permission
       visit path
     end
 
diff --git a/spec/features/referential_lines_permissions_spec.rb b/spec/features/referential_lines_permissions_spec.rb
index bedec3d07..0d156f0d6 100644
--- a/spec/features/referential_lines_permissions_spec.rb
+++ b/spec/features/referential_lines_permissions_spec.rb
@@ -7,7 +7,7 @@ describe 'ReferentialLines', type: :feature do
 
   context 'permissions' do 
     before do
-      allow_any_instance_of(Chouette::RoutePolicy).to receive(:create?).and_return permission
+      allow_any_instance_of(RoutePolicy).to receive(:create?).and_return permission
       visit path
     end
     
diff --git a/spec/features/routes_permissions_spec.rb b/spec/features/routes_permissions_spec.rb
index 467d8479d..36c13b24a 100644
--- a/spec/features/routes_permissions_spec.rb
+++ b/spec/features/routes_permissions_spec.rb
@@ -11,8 +11,8 @@ describe "Routes", :type => :feature do
   describe 'permissions' do
     before do
       @user.update(organisation: referential.organisation)
-      allow_any_instance_of(Chouette::RoutePolicy).to receive(:edit?).and_return permission
-      allow_any_instance_of(Chouette::RoutePolicy).to receive(:destroy?).and_return permission
+      allow_any_instance_of(RoutePolicy).to receive(:edit?).and_return permission
+      allow_any_instance_of(RoutePolicy).to receive(:destroy?).and_return permission
       visit path
     end
 
diff --git a/spec/features/time_tables_permissions_spec.rb b/spec/features/time_tables_permissions_spec.rb
index 01c7c2ed2..bd94a3aa1 100644
--- a/spec/features/time_tables_permissions_spec.rb
+++ b/spec/features/time_tables_permissions_spec.rb
@@ -8,7 +8,7 @@ describe "TimeTables", :type => :feature do
 
   describe 'permissions' do
     before do
-      allow_any_instance_of(Chouette::TimeTablePolicy).to receive(:duplicate?).and_return permission
+      allow_any_instance_of(TimeTablePolicy).to receive(:duplicate?).and_return permission
       visit path
     end
 
diff --git a/spec/policies/access_link_policy_spec.rb b/spec/policies/access_link_policy_spec.rb
index 392ad7f92..6194ae55c 100644
--- a/spec/policies/access_link_policy_spec.rb
+++ b/spec/policies/access_link_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::AccessLinkPolicy, type: :policy do
+RSpec.describe AccessLinkPolicy, type: :policy do
 
   let( :record ){ build_stubbed :access_link }
 
diff --git a/spec/policies/access_point_policy_spec.rb b/spec/policies/access_point_policy_spec.rb
index 8154b3d24..b6bc46eb4 100644
--- a/spec/policies/access_point_policy_spec.rb
+++ b/spec/policies/access_point_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::AccessPointPolicy, type: :policy do
+RSpec.describe AccessPointPolicy, type: :policy do
 
   let( :record ){ build_stubbed :access_point }
 
diff --git a/spec/policies/company_policy_spec.rb b/spec/policies/company_policy_spec.rb
index f374e31d2..2d249a2be 100644
--- a/spec/policies/company_policy_spec.rb
+++ b/spec/policies/company_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::CompanyPolicy, type: :policy do
+RSpec.describe CompanyPolicy, type: :policy do
 
   let( :record ){ build_stubbed :company }
   before { stub_policy_scope(record) }
diff --git a/spec/policies/connection_link_policy_spec.rb b/spec/policies/connection_link_policy_spec.rb
index 17cfdeb04..23e40abe3 100644
--- a/spec/policies/connection_link_policy_spec.rb
+++ b/spec/policies/connection_link_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::ConnectionLinkPolicy, type: :policy do
+RSpec.describe ConnectionLinkPolicy, type: :policy do
 
   let( :record ){ build_stubbed :connection_link }
 
diff --git a/spec/policies/group_of_line_policy_spec.rb b/spec/policies/group_of_line_policy_spec.rb
index 7a58a7f0e..29fbb1bfb 100644
--- a/spec/policies/group_of_line_policy_spec.rb
+++ b/spec/policies/group_of_line_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::GroupOfLinePolicy, type: :policy do
+RSpec.describe GroupOfLinePolicy, type: :policy do
 
   let( :record ){ build_stubbed :group_of_line }
   before { stub_policy_scope(record) }
diff --git a/spec/policies/journey_pattern_policy_spec.rb b/spec/policies/journey_pattern_policy_spec.rb
index a7de379a2..39f849277 100644
--- a/spec/policies/journey_pattern_policy_spec.rb
+++ b/spec/policies/journey_pattern_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::JourneyPatternPolicy, type: :policy do
+RSpec.describe JourneyPatternPolicy, type: :policy do
 
   let( :record ){ build_stubbed :journey_pattern }
 
diff --git a/spec/policies/line_policy_spec.rb b/spec/policies/line_policy_spec.rb
index d2248e750..334073506 100644
--- a/spec/policies/line_policy_spec.rb
+++ b/spec/policies/line_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::LinePolicy, type: :policy do
+RSpec.describe LinePolicy, type: :policy do
 
   let( :record ){ build_stubbed :line }
   before { stub_policy_scope(record) }
diff --git a/spec/policies/routing_constraint_zone_policy_spec.rb b/spec/policies/routing_constraint_zone_policy_spec.rb
index 903e3671a..2ef15fa95 100644
--- a/spec/policies/routing_constraint_zone_policy_spec.rb
+++ b/spec/policies/routing_constraint_zone_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::RoutingConstraintZonePolicy, type: :policy do
+RSpec.describe RoutingConstraintZonePolicy, type: :policy do
 
   let( :record ){ build_stubbed :routing_constraint_zone }
 
diff --git a/spec/policies/stop_area_policy_spec.rb b/spec/policies/stop_area_policy_spec.rb
index 1295ecd68..8fe59c8e3 100644
--- a/spec/policies/stop_area_policy_spec.rb
+++ b/spec/policies/stop_area_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::StopAreaPolicy, type: :policy do
+RSpec.describe StopAreaPolicy, type: :policy do
 
   let( :record ){ build_stubbed :stop_area }
   before { stub_policy_scope(record) }
diff --git a/spec/policies/time_table_policy_spec.rb b/spec/policies/time_table_policy_spec.rb
index 6f1e13844..dad3c13bc 100644
--- a/spec/policies/time_table_policy_spec.rb
+++ b/spec/policies/time_table_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::TimeTablePolicy, type: :policy do
+RSpec.describe TimeTablePolicy, type: :policy do
 
   let( :record ){ build_stubbed :time_table }
 
diff --git a/spec/views/routes/show.html.erb_spec.rb b/spec/views/routes/show.html.erb_spec.rb
index ee917127f..dae8c9ed3 100644
--- a/spec/views/routes/show.html.erb_spec.rb
+++ b/spec/views/routes/show.html.erb_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe "/routes/show", type: :view do
   let!(:route_sp) do
     assign :route_sp, ModelDecorator.decorate(
       route.stop_points,
-      with: Chouette::StopPointDecorator
+      with: StopPointDecorator
     )
   end