diff options
author | Louise Crow <louise.crow@gmail.com> | 2015-05-15 16:11:04 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2015-05-15 16:11:04 +0100 |
commit | da706b6c05ee7d0be15b59cf0fdec7f6d3ed58ec (patch) | |
tree | 3ed7a8bda9140abad6001080aaf9c29b7fa1f0d8 /spec/helpers | |
parent | 8c29864c8a84d0113209a33c4421abd10fd47c5b (diff) | |
parent | 576b58803635de9d16dd7cd1c2a68b692ba11743 (diff) |
Merge branch 'set-file-encodings' into rails-3-develop
Diffstat (limited to 'spec/helpers')
-rw-r--r-- | spec/helpers/admin_helper_spec.rb | 1 | ||||
-rw-r--r-- | spec/helpers/application_helper_spec.rb | 1 | ||||
-rw-r--r-- | spec/helpers/date_time_helper_spec.rb | 1 | ||||
-rw-r--r-- | spec/helpers/health_checks_helper_spec.rb | 1 | ||||
-rw-r--r-- | spec/helpers/highlight_helper_spec.rb | 1 | ||||
-rw-r--r-- | spec/helpers/link_to_helper_spec.rb | 1 | ||||
-rw-r--r-- | spec/helpers/public_body_helper_spec.rb | 2 | ||||
-rw-r--r-- | spec/helpers/track_helper_spec.rb | 1 | ||||
-rw-r--r-- | spec/helpers/widget_helper_spec.rb | 3 |
9 files changed, 10 insertions, 2 deletions
diff --git a/spec/helpers/admin_helper_spec.rb b/spec/helpers/admin_helper_spec.rb index 804fcc7fd..1f0155c98 100644 --- a/spec/helpers/admin_helper_spec.rb +++ b/spec/helpers/admin_helper_spec.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe AdminHelper do diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 6407eaf3a..2035c343a 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe ApplicationHelper do diff --git a/spec/helpers/date_time_helper_spec.rb b/spec/helpers/date_time_helper_spec.rb index c4fdee1d1..f69a0ef80 100644 --- a/spec/helpers/date_time_helper_spec.rb +++ b/spec/helpers/date_time_helper_spec.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe DateTimeHelper do diff --git a/spec/helpers/health_checks_helper_spec.rb b/spec/helpers/health_checks_helper_spec.rb index 7dbfaf06e..9418864b5 100644 --- a/spec/helpers/health_checks_helper_spec.rb +++ b/spec/helpers/health_checks_helper_spec.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe HealthChecksHelper do diff --git a/spec/helpers/highlight_helper_spec.rb b/spec/helpers/highlight_helper_spec.rb index e1be7e153..2641a4400 100644 --- a/spec/helpers/highlight_helper_spec.rb +++ b/spec/helpers/highlight_helper_spec.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe HighlightHelper do diff --git a/spec/helpers/link_to_helper_spec.rb b/spec/helpers/link_to_helper_spec.rb index 261e1ef3e..fbb0c2313 100644 --- a/spec/helpers/link_to_helper_spec.rb +++ b/spec/helpers/link_to_helper_spec.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe LinkToHelper do diff --git a/spec/helpers/public_body_helper_spec.rb b/spec/helpers/public_body_helper_spec.rb index d4f3acf78..8db07b979 100644 --- a/spec/helpers/public_body_helper_spec.rb +++ b/spec/helpers/public_body_helper_spec.rb @@ -1,4 +1,4 @@ -# encoding: UTF-8 +# -*- encoding : utf-8 -*- require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe PublicBodyHelper do diff --git a/spec/helpers/track_helper_spec.rb b/spec/helpers/track_helper_spec.rb index b6252ab39..bc1266338 100644 --- a/spec/helpers/track_helper_spec.rb +++ b/spec/helpers/track_helper_spec.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe TrackHelper do diff --git a/spec/helpers/widget_helper_spec.rb b/spec/helpers/widget_helper_spec.rb index c8c41b14f..614ed92ad 100644 --- a/spec/helpers/widget_helper_spec.rb +++ b/spec/helpers/widget_helper_spec.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe WidgetHelper do @@ -25,4 +26,4 @@ describe WidgetHelper do end -end
\ No newline at end of file +end |