Skip to content
Extraits de code Groupes Projets
Valider b0ec5a0b rédigé par zhitomirskiyi's avatar zhitomirskiyi
Parcourir les fichiers

moved the fixture to the right place

parent e9c094fc
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -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}
......@@ -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"
......
......@@ -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
......
......@@ -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
......
......@@ -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(){
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter