parent
5f3e4fc358
commit
18dbf02181
3 changed files with 11 additions and 2 deletions
|
|
@ -138,6 +138,7 @@ before.
|
||||||
* Do not allow to change email to an already used one [#6905](https://github.com/diaspora/diaspora/pull/6905)
|
* Do not allow to change email to an already used one [#6905](https://github.com/diaspora/diaspora/pull/6905)
|
||||||
* Correctly filter mentions on the server side [#6902](https://github.com/diaspora/diaspora/pull/6902)
|
* Correctly filter mentions on the server side [#6902](https://github.com/diaspora/diaspora/pull/6902)
|
||||||
* Add aspects to the aspect membership dropdown when creating them on the getting started page [#6864](https://github.com/diaspora/diaspora/pull/6864)
|
* Add aspects to the aspect membership dropdown when creating them on the getting started page [#6864](https://github.com/diaspora/diaspora/pull/6864)
|
||||||
|
* Strip markdown from message preview in conversations list [#6923](https://github.com/diaspora/diaspora/pull/6923)
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
* Support color themes [#6033](https://github.com/diaspora/diaspora/pull/6033)
|
* Support color themes [#6033](https://github.com/diaspora/diaspora/pull/6033)
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
.last_message
|
.last_message
|
||||||
- if conversation.messages.present?
|
- if conversation.messages.present?
|
||||||
%em
|
%em
|
||||||
= conversation.messages.last.text
|
= conversation.messages.last.message.plain_text_without_markdown
|
||||||
- if other_participants.count > 1
|
- if other_participants.count > 1
|
||||||
.participants
|
.participants
|
||||||
- other_participants.drop(1).take(15).each do |participant|
|
- other_participants.drop(1).take(15).each do |participant|
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ describe ConversationsController, :type => :controller do
|
||||||
author: alice.person,
|
author: alice.person,
|
||||||
participant_ids: [alice.contacts.first.person.id, alice.person.id],
|
participant_ids: [alice.contacts.first.person.id, alice.person.id],
|
||||||
subject: "not spam",
|
subject: "not spam",
|
||||||
messages_attributes: [{author: alice.person, text: "cool stuff"}]
|
messages_attributes: [{author: alice.person, text: "**cool stuff**"}]
|
||||||
}
|
}
|
||||||
@conversations = Array.new(3) { Conversation.create(hash) }
|
@conversations = Array.new(3) { Conversation.create(hash) }
|
||||||
@visibilities = @conversations.map {|conversation|
|
@visibilities = @conversations.map {|conversation|
|
||||||
|
|
@ -102,6 +102,14 @@ describe ConversationsController, :type => :controller do
|
||||||
get :index, conversation_id: @conversations.first.id
|
get :index, conversation_id: @conversations.first.id
|
||||||
expect(assigns[:conversation]).to be_nil
|
expect(assigns[:conversation]).to be_nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it "retrieves a conversation message with out markdown content " do
|
||||||
|
get :index
|
||||||
|
@conversation = @conversations.first
|
||||||
|
expect(response).to be_success
|
||||||
|
expect(response.body).to match(/cool stuff/)
|
||||||
|
expect(response.body).not_to match(%r{<strong>cool stuff</strong>})
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#create' do
|
describe '#create' do
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue