From a30affe8d34113f08089bfda42c5bc786b76c3f7 Mon Sep 17 00:00:00 2001
From: zhitomirskiyi <ilya@joindiaspora.com>
Date: Wed, 16 Mar 2011 18:10:29 -0700
Subject: [PATCH] moved the fixture to the right place
---
app/views/status_messages/new.haml | 2 +-
config/locales/diaspora/en.yml | 3 +--
spec/controllers/people_controller_spec.rb | 9 ---------
spec/controllers/status_messages_controller_spec.rb | 9 +++++++++
spec/javascripts/publisher-spec.js | 4 ++--
5 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/app/views/status_messages/new.haml b/app/views/status_messages/new.haml
index 9e9d3c1427..5fc3d362ec 100644
--- a/app/views/status_messages/new.haml
+++ b/app/views/status_messages/new.haml
@@ -17,6 +17,6 @@
.span-15
#facebox_header
%h4
- = t('conversations.index.new_message')
+ = t('mentioning') + @person.name
= render :partial => 'shared/publisher', :locals => { :aspect => @aspect, :aspect_ids => @aspect_ids, :aspects_with_person => @aspects_with_person, :person => @person}
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 19607d7001..80cefb7d94 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -539,8 +539,7 @@ en:
status_messages:
new_status_message:
- tell_me_something_good: "tell me something good"
- oh_yeah: "oh yeah!"
+ mentioning: "Mentioning: "
show:
destroy: "Delete"
permalink: "permalink"
diff --git a/spec/controllers/people_controller_spec.rb b/spec/controllers/people_controller_spec.rb
index 78792edc91..a0c5f775c2 100644
--- a/spec/controllers/people_controller_spec.rb
+++ b/spec/controllers/people_controller_spec.rb
@@ -172,15 +172,6 @@ describe PeopleController do
get :show, :id => @person.id
assigns(:posts).should =~ posts_user_can_see
end
-
- it 'generates a jasmine fixture' do
- contact = @user.contact_for(@person)
- aspect = @user.aspects.create(:name => 'people')
- contact.aspects << aspect
- contact.save
- get :show, :id => @person
- save_fixture(html_for("body"), "person_show")
- end
end
context "when the person is not a contact of the current user" do
diff --git a/spec/controllers/status_messages_controller_spec.rb b/spec/controllers/status_messages_controller_spec.rb
index 5c98750424..77ca3539cc 100644
--- a/spec/controllers/status_messages_controller_spec.rb
+++ b/spec/controllers/status_messages_controller_spec.rb
@@ -26,6 +26,15 @@ describe StatusMessagesController do
:person_id => @user2.person.id
response.should be_success
end
+
+ it 'generates a jasmine fixture' do
+ contact = @user1.contact_for(@user2.person)
+ aspect = @user1.aspects.create(:name => 'people')
+ contact.aspects << aspect
+ contact.save
+ get :new, :person_id => @user2.person.id, :layout => true
+ save_fixture(html_for("body"), "status_message_new")
+ end
end
describe '#show' do
diff --git a/spec/javascripts/publisher-spec.js b/spec/javascripts/publisher-spec.js
index 0dcbf40da3..7197d4aa60 100644
--- a/spec/javascripts/publisher-spec.js
+++ b/spec/javascripts/publisher-spec.js
@@ -23,7 +23,7 @@ describe("Publisher", function() {
describe("bindAspectToggles", function() {
beforeEach( function(){
- spec.loadFixture('person_show');
+ spec.loadFixture('status_message_new');
});
it('gets called on initialize', function(){
@@ -69,7 +69,7 @@ describe("Publisher", function() {
});
describe('toggleAspectIds', function(){
beforeEach( function(){
- spec.loadFixture('person_show');
+ spec.loadFixture('status_message_new');
});
it('adds a hidden field to the form if there is not one already', function(){
--
GitLab