From e275b42cb4bdbdc3556a09874c4251d4586759d2 Mon Sep 17 00:00:00 2001 From: James McKinney Date: Sun, 16 Oct 2011 14:27:13 -0400 Subject: add encoding magic comments and fix paths --- spec/controllers/user_controller_spec.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'spec/controllers/user_controller_spec.rb') diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb index ae771da04..824cc9c42 100644 --- a/spec/controllers/user_controller_spec.rb +++ b/spec/controllers/user_controller_spec.rb @@ -1,3 +1,4 @@ +# coding: utf-8 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') require 'json' -- cgit v1.2.3 From 0bf2e8d5cb7a34f3bc932d88f0ec4293320aca4d Mon Sep 17 00:00:00 2001 From: James McKinney Date: Sun, 16 Oct 2011 20:12:26 -0400 Subject: allow specs to run independently --- spec/controllers/user_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/controllers/user_controller_spec.rb') diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb index ae771da04..fdc3961a1 100644 --- a/spec/controllers/user_controller_spec.rb +++ b/spec/controllers/user_controller_spec.rb @@ -7,7 +7,7 @@ require 'json' describe UserController, "when showing a user" do integrate_views - fixtures :users, :public_bodies, :public_body_translations, :info_requests, :raw_emails, :incoming_messages, :outgoing_messages, :info_request_events, :comments + fixtures :users, :public_bodies, :public_body_translations, :public_body_versions, :info_requests, :raw_emails, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things before(:each) do load_raw_emails_data(raw_emails) end -- cgit v1.2.3 From abbf7b4b9ae8f18d00ff4d92516d853aeacf8724 Mon Sep 17 00:00:00 2001 From: James McKinney Date: Sun, 16 Oct 2011 20:18:33 -0400 Subject: call #first on from_addrs and to_addrs before calling #to_s --- spec/controllers/user_controller_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/controllers/user_controller_spec.rb') diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb index 824cc9c42..9b7b99839 100644 --- a/spec/controllers/user_controller_spec.rb +++ b/spec/controllers/user_controller_spec.rb @@ -261,8 +261,8 @@ describe UserController, "when sending another user a message" do mail = deliveries[0] mail.body.should include("Bob Smith has used #{MySociety::Config.get('SITE_NAME')} to send you the message below") mail.body.should include("Just a test!") - #mail.to_addrs.to_s.should == users(:silly_name_user).name_and_email # XXX fix some nastiness with quoting name_and_email - mail.from_addrs.to_s.should == users(:bob_smith_user).name_and_email + #mail.to_addrs.first.to_s.should == users(:silly_name_user).name_and_email # XXX fix some nastiness with quoting name_and_email + mail.from_addrs.first.to_s.should == users(:bob_smith_user).name_and_email end end -- cgit v1.2.3