diff options
| author | Mark Longair <mhl@pobox.com> | 2013-11-15 11:39:12 +0000 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-11-15 11:39:12 +0000 |
| commit | 64618741c17760fcb59647d74d1ccaff56160b15 (patch) | |
| tree | d84f1f035b136180f0bdacb22895fbb0f1abf2c1 /spec/controllers/admin_public_body_controller_spec.rb | |
| parent | 96b3b5adbdafb25e5ab6ca94b89d6682a2e8f0e4 (diff) | |
| parent | cda26c36f309cdd8e8bbab9186f6cc0d4876e6c9 (diff) | |
Merge branch 'release/0.15' into wdtk
Conflicts:
lib/tasks/stats.rake
Diffstat (limited to 'spec/controllers/admin_public_body_controller_spec.rb')
| -rw-r--r-- | spec/controllers/admin_public_body_controller_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb index 8a72db724..fe5087d7c 100644 --- a/spec/controllers/admin_public_body_controller_spec.rb +++ b/spec/controllers/admin_public_body_controller_spec.rb @@ -55,7 +55,8 @@ describe AdminPublicBodyController, "when administering public bodies" do end it "mass assigns tags" do - n = PublicBody.count + condition = "public_body_translations.locale = ?" + n = PublicBody.joins(:translations).where([condition, "en"]).count post :mass_tag_add, { :new_tag => "department", :table_name => "substring" } request.flash[:notice].should == "Added tag to table of bodies." response.should redirect_to(:action=>'list') |