Commit graph

64 commits

Author SHA1 Message Date
Benjamin Neff
e82690963d
Add # frozen_string_literal: true to all files 2017-09-17 19:29:15 +02:00
Steffen van Bergerem
48630b3a04
Fix conversation recipient prefill on contacts page
Use the already available contacts data for the prefill
2017-08-29 02:13:27 +02:00
Steffen van Bergerem
666ada44f1
Fix conversation recipient prefill on profile page
Fixes #7586

Use the already available data about the recipient for the prefill
2017-08-29 02:13:27 +02:00
Benjamin Neff
6d7ba96c4f
Remove locals option from render_template assertion
The locals option is only supported in ActionView::TestCase, so it is
ignored anyway (even worse, it disabled the complete assertion). I added
some more assertions to ensure the template is rendered with the correct
conversation.

closes #7588
2017-08-29 02:02:03 +02:00
Benjamin Neff
2a6515fab9
Add params keyword to controller specs 2017-08-12 15:39:23 +02:00
Justin Ramos
fa71af71c1 require spec_helper in .rspec
closes #7223
2016-11-27 21:27:12 +01:00
Steffen van Bergerem
9b72527f3e Refactor conversations controller creation specs
closes #7197
2016-11-18 02:14:18 +01:00
Steffen van Bergerem
457cf2aafb Fix deprecation warnings in conversations controller spec
closes #7187
2016-11-14 03:27:55 +01:00
Steffen van Bergerem
7cd2232812 Only allow conversation creation in controller with mututal contacts 2016-11-14 03:27:15 +01:00
Steffen van Bergerem
9cbadec659 Move 'XSS via name parameter' to mobile conversation specs
because the desktop view doesn't use the name parameter anymore
2016-11-13 20:08:59 +01:00
Augier
f2fdaf1daf Use typeahead on conversations 2016-11-13 20:08:59 +01:00
Steffen van Bergerem
3bea40b248
Refactor conversations creation
closes #7131
2016-10-27 02:23:35 +02:00
Augier
e424896822
Fully port conversations to Backbone and drop inbox.js 2016-09-30 00:32:46 +02:00
Steffen van Bergerem
7b5ac656a7
Fix conversations autoSuggest showing non-mutual contacts 2016-08-18 13:02:14 +02:00
cmrd Senya
4ae26e1ded Upgrade devise to 4.2 2016-08-11 12:25:36 +03:00
SaiVardhan
18dbf02181
[FIX] #6642 Strip Markdown from conversation title
closes #6642
2016-08-08 19:23:17 +02:00
Benjamin Neff
ae05d4e928 use Diaspora::Federation::Dispatcher everywhere 2016-06-26 06:21:01 +02:00
Benjamin Neff
010afa1019 refactor: iterate over visiblities
closes #6060
2015-06-08 00:45:16 +02:00
Steffen van Bergerem
8962d75eb7 Conversations: fix badge count and automatic scrolling 2015-02-10 19:11:20 +01:00
Steffen van Bergerem
976ff0fcda Redesign profile page and port to Bootstrap 2014-10-01 12:28:56 +02:00
Steffen van Bergerem
ba0bccbef1 Redirect conversations/new to conversations 2014-09-01 17:11:56 +02:00
Jonne Haß
99de61fdfa Merge branch 'release/0.4.1.0' into develop 2014-08-30 22:15:56 +02:00
Jonne Haß
6df79f6983 so turns out whether an id is serialized to a json integer or string
depends on the DB backend
2014-08-30 22:15:05 +02:00
Jonne Haß
1515848120 Merge branch 'release/0.4.1.0' into develop
Conflicts:
	app/controllers/conversations_controller.rb
	spec/controllers/conversations_controller_spec.rb
2014-08-30 20:09:08 +02:00
Jonne Haß
5d549f553b Escape person name in contacts json
jQuery autoSuggest uses .html to insert it into the DOM
2014-08-30 20:06:03 +02:00
khall
c42916df27 Two tests failing after rspec 2.99 => 3.0.0 2014-08-26 17:10:26 -07:00
khall
027bb9fcb0 Rspec version bump to 2.99 2014-08-26 17:00:21 -07:00
Jonne Haß
42b08e8ab8 Update to Rails 4.1 2014-08-25 17:37:02 +02:00
Jonne Haß
21feb91d27 always pass desired format in specs unless it's html 2014-08-23 16:34:01 +02:00
Jonne Haß
df0bff6537 replace stub! with stub 2014-01-13 12:25:37 +01:00
kevivmatrix
6623e86a5a private message sending changed to ajax
added specs for change in controller

one form of hash used in single line of code

rendering create response on sending message

redirect user to conversation page if message sent successfully

removed deprecated way of rendering file

conversations create for mobile fixed

minor code style change

updated changelog
2013-07-06 14:35:09 +05:30
Jonne Haß
94207e844c Drop weird stop in conversations controller spec 2013-06-27 17:50:44 +02:00
David Thompson
b3c859bcd5 Check for nil before splitting contact_ids param. 2013-06-15 17:14:30 -04:00
Jonne Haß
cf9659de4a fix XSS vulnerability in conversations#new, closes #4010 2013-02-26 19:09:30 +01:00
movilla
597ab20715 Show error and flash-notice when sending messages to non contacts 2012-12-26 12:23:37 +01:00
Jonne Haß
58d1448085 update factory girl 2012-09-12 13:24:23 +02:00
Maxwell Salzberg
b124d3e5a1 Revert "update factory girl" new version does not support 1.8.7 :(
This reverts commit c52342b7cb.
2012-05-16 17:43:56 -07:00
Maxwell Salzberg
c52342b7cb update factory girl 2012-05-16 17:17:14 -07:00
Maxwell Salzberg
e521ac92f9 make a test slightly dumber for travis 2012-04-03 16:52:34 -07:00
Stephan Schulz
716315409a Limit allowed contacts for sending messages to, to the ones that are sharing with you. 2012-03-23 01:21:04 +01:00
Maxwell Salzberg
39c7478b4a Revert "freeze time in conversations show spec to make ree travis happy"
as it did not work :/

This reverts commit d668b21cd4.
2012-03-17 19:21:24 -07:00
Maxwell Salzberg
d668b21cd4 freeze time in conversations show spec to make ree travis happy 2012-03-17 19:06:26 -07:00
Maxwell Salzberg
67e4f9e159 remove puts and fix a conversationscontroller spec to be a bit more predictable 2012-03-03 16:25:10 -08:00
Maxwell Salzberg
0d93227f07 hopefully make travis happy: 2012-02-28 17:52:13 -08:00
Diaspora Europe
57de352238 added some specs for json response 2012-02-24 10:22:16 +01:00
Diaspora Europe
e4e1362ff5 added spec for redirect to conversations_controller_spec 2012-02-08 16:53:48 +01:00
Maxwell Salzberg
49f18d435a upgrade factory girl there are 3 failing cukes. 2012-01-21 21:58:50 -08:00
Manuel
1c9a96e2aa Fixed relayable specs 2011-11-20 01:06:45 +01:00
Maxwell Salzberg
60ace5c297 DG MS; Broke out HydraWrapper in HttpMulti job 2011-09-14 15:50:07 -07:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00