diff options
| author | Francis Irving <francis@mysociety.org> | 2010-07-13 23:54:46 +0100 |
|---|---|---|
| committer | Francis Irving <francis@mysociety.org> | 2010-07-13 23:54:46 +0100 |
| commit | 59395b3bdf19aed7bf5f77656afa6c31dad7e138 (patch) | |
| tree | b6e4c9f9e5b4a9f792a550ce3af727ae32b1cba1 /spec/models/user_spec.rb | |
| parent | 452ac41f05f655a9fd23c8df4796f26632c23050 (diff) | |
| parent | da2c0aaf5f0d07baa3a355033a92d5dd295f2f13 (diff) | |
Merge branch 'master' into francis-profile-photo
Conflicts:
app/views/user/show.rhtml
commonlib
spec/controllers/user_controller_spec.rb
Diffstat (limited to 'spec/models/user_spec.rb')
| -rw-r--r-- | spec/models/user_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index f4df22e9d..5d2bd39c7 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -231,8 +231,8 @@ describe User, " when making name and email address" do end end - -describe User, " when setting a profile photo" do +# XXX not finished +describe User, "when setting a profile photo" do before do @user = User.new @user.name = "Sensible User" |