Merge branch 'feature/locale-underscore-fixes' into rails-3-develop

1 files changed, 18 insertions, 0 deletions

diff --git a/spec/models/public_body_spec.rb b/spec/models/public_body_spec.rb
index d1e2e233d..ed24ced52 100644
--- a/spec/models/public_body_spec.rb
+++ b/spec/models/public_body_spec.rb
@@ -213,6 +213,15 @@ describe PublicBody, " when saving" do
         public_body.name.should == "Mark's Public Body"
     end
 
+    it 'should update the right translation when in a locale with an underscore' do
+        AlaveteliLocalization.set_locales('he_IL', 'he_IL')
+        public_body = public_bodies(:humpadink_public_body)
+        translation_count = public_body.translations.size
+        public_body.name = 'Renamed'
+        public_body.save!
+        public_body.translations.size.should == translation_count
+    end
+
     it 'should not create a new version when nothing has changed' do
         @public_body.versions.size.should == 0
         set_default_attributes(@public_body)
@@ -618,3 +627,12 @@ describe PublicBody, "when calculating statistics" do
     end
 
 end
+
+describe PublicBody, 'when asked for popular bodies' do
+
+    it 'should return bodies correctly when passed the hyphenated version of the locale' do
+        AlaveteliConfiguration.stub!(:frontpage_publicbody_examples).and_return('')
+        PublicBody.popular_bodies('he-IL').should == [public_bodies(:humpadink_public_body)]
+    end
+
+end