diff --git a/app/views/status_messages/new.haml b/app/views/status_messages/new.haml index 9e9d3c1427036e0d64a4acd8c3e0d83204e8ae8e..5fc3d362ec1174287ec0503ed502d70d59a7cca3 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 19607d700172a85104a006a3f46bdfcd91446462..80cefb7d94d99446d09bf51f986f5b996f6d3c87 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 78792edc911a2a3215257850ff15aa9fce3c55ea..a0c5f775c24c84bd05a8aae007199baedacae0a8 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 5c987504242045353eefd3a853d47453e4ad833f..77ca3539ccae5ae32ef50041ad926adf9d1227fc 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 0dcbf40da3119ad766fc78ec46e17f29d6b0fb8a..7197d4aa604e183de0a7f1e3b9996f58d5d10cc8 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(){