Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								201d7fb448 
								
							
								 
							
						 
						
							
							
								
								Merge branches 'develop' and 't3chguy/prop-types' of github.com:matrix-org/matrix-react-sdk into t3chguy/prop-types  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	test/components/structures/MessagePanel-test.js 
							
						 
						
							2019-07-31 12:21:00 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								1087e04bb5 
								
							
								 
							
						 
						
							
							
								
								Replace React.PropTypes with usage of the `prop-types` package  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-07-31 12:19:29 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								c338f8bf1f 
								
							
								 
							
						 
						
							
							
								
								Add `room` context to test  
							
							 
							
							
							
						 
						
							2019-07-31 11:17:28 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								ba5238d86a 
								
							
								 
							
						 
						
							
							
								
								Finally fix tests  
							
							 
							
							
							
						 
						
							2019-07-11 15:01:56 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								698fd3b897 
								
							
								 
							
						 
						
							
							
								
								Hopefully actually make the tests happy  
							
							 
							
							
							
						 
						
							2019-07-11 14:45:36 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								a9419135aa 
								
							
								 
							
						 
						
							
							
								
								Fix tests to use UIA proper  
							
							 
							
							
							
						 
						
							2019-07-11 14:38:28 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								111b28971a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3202  from matrix-org/travis/stably-use-stable-apis  
							
							 
							
							... 
							
							
							
							Use r0 media endpoints for group tests 
							
						 
						
							2019-07-11 08:20:08 -06:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								959f8fd844 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-07-10 21:58:08 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								90212c76a5 
								
							
								 
							
						 
						
							
							
								
								Use r0 media endpoints for group tests  
							
							 
							
							
							
						 
						
							2019-07-10 13:24:47 -06:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								8b16f91b3d 
								
							
								 
							
						 
						
							
							
								
								fix karma tests?  
							
							 
							
							
							
						 
						
							2019-06-13 15:50:23 +02:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								7602d76723 
								
							
								 
							
						 
						
							
							
								
								fix test  
							
							 
							
							
							
						 
						
							2019-06-11 13:16:49 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								ae63df95ea 
								
							
								 
							
						 
						
							
							
								
								Fix tests to use new serverConfig prop  
							
							 
							
							
							
						 
						
							2019-05-03 11:34:30 -06:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								30dc6a9150 
								
							
								 
							
						 
						
							
							
								
								remove tests relying on scrollpanel behaviour  
							
							 
							
							... 
							
							
							
							as BACAT scrolling relies on CSS from riot, which is not
included in the karma tests, we're removing these
tests in favor of later adding them to the e2e tests. 
							
						 
						
							2019-03-28 17:57:08 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								494779393f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into bwindels/bacat-scrolling  
							
							 
							
							
							
						 
						
							2019-03-21 13:50:32 +01:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
								
								
							
							
								
							
								99369a54fe 
								
									
								
							
								 
							
						 
						
							
							
								
								Typo  
							
							 
							
							... 
							
							
							
							Co-Authored-By: dbkr <dbkr@users.noreply.github.com> 
							
						 
						
							2019-03-20 18:11:42 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								58b2068fbf 
								
							
								 
							
						 
						
							
							
								
								Set velocity's mock option in the unit test  
							
							 
							
							
							
						 
						
							2019-03-20 17:43:19 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								95e61a57bc 
								
							
								 
							
						 
						
							
							
								
								fix some tests  
							
							 
							
							
							
						 
						
							2019-03-15 10:16:21 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								65807c7a66 
								
							
								 
							
						 
						
							
							
								
								Revert "remove test for  #528  as we removed that fix"  
							
							 
							
							... 
							
							
							
							This reverts commit 42030796c7 . 
							
						 
						
							2019-03-01 16:08:58 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								42030796c7 
								
							
								 
							
						 
						
							
							
								
								remove test for  #528  as we removed that fix  
							
							 
							
							
							
						 
						
							2019-02-26 10:49:03 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								b12362dd37 
								
							
								 
							
						 
						
							
							
								
								Disable dragging tests for room list  
							
							 
							
							... 
							
							
							
							We don't support dragging, so don't test it. 
							
						 
						
							2019-02-13 19:51:34 -07:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								71c30b5641 
								
							
								 
							
						 
						
							
							
								
								Add some basic login tests  
							
							 
							
							
							
						 
						
							2019-02-05 16:33:12 +00:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								71d1a24fcb 
								
							
								 
							
						 
						
							
							
								
								Add some basic registration tests  
							
							 
							
							
							
						 
						
							2019-02-05 09:26:45 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								42161f3a23 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2019-01-30 18:43:16 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								d20bdbbc1a 
								
							
								 
							
						 
						
							
							
								
								Disable room settings tests  
							
							 
							
							
							
						 
						
							2019-01-28 14:11:10 -07:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								20b7debcaf 
								
							
								 
							
						 
						
							
							
								
								Remove support for team servers  
							
							 
							
							
							
						 
						
							2019-01-25 16:13:30 -06:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								9470424bcb 
								
							
								 
							
						 
						
							
							
								
								Enable linting for all auth related files  
							
							 
							
							
							
						 
						
							2019-01-23 18:32:36 -06:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								29be3ee4b5 
								
							
								 
							
						 
						
							
							
								
								Rename login directory to auth  
							
							 
							
							
							
						 
						
							2019-01-21 17:45:55 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								0ebde5266e 
								
							
								 
							
						 
						
							
							
								
								Appease the linter again  
							
							 
							
							
							
						 
						
							2019-01-03 22:40:44 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								f59625f7bd 
								
							
								 
							
						 
						
							
							
								
								Fix last active test  
							
							 
							
							... 
							
							
							
							Time is backwards from all the other tests: larger is older, so we want LessThanOrEqual. Also ensure all the power levels are the same to prevent the sort algorithm from running a PL ordering. 
							
						 
						
							2019-01-03 22:24:24 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								34d5870a03 
								
							
								 
							
						 
						
							
							
								
								Appease the linter  
							
							 
							
							
							
						 
						
							2019-01-03 22:07:09 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								77dfba8a22 
								
							
								 
							
						 
						
							
							
								
								Add unit tests for MemberList  
							
							 
							
							... 
							
							
							
							Particularly the ordering of the tiles. 
							
						 
						
							2019-01-03 21:55:52 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								8017f0a4a1 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real  
							
							 
							
							
							
						 
						
							2019-01-03 16:00:23 -07:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f928be6f59 
								
							
								 
							
						 
						
							
							
								
								Revert "Merge pull request  #2395  from matrix-org/dbkr/merge_develop_experimental"  
							
							 
							
							... 
							
							
							
							This reverts commit ad47144355 . 
							
						 
						
							2019-01-03 15:37:03 -07:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								7d161de35b 
								
							
								 
							
						 
						
							
							
								
								Partial merge of develop to experimental  
							
							 
							
							... 
							
							
							
							Does not include #2336  as the file has been moved out from underneath it:
will do this separately 
							
						 
						
							2019-01-03 15:02:58 +00:00  
						
					 
				
					
						
							
							
								 
								Stephen Solka
							
						 
						
							 
							
							
							
								
							
								0bb35944f9 
								
							
								 
							
						 
						
							
							
								
								replace expect.createSpy() with jest.fn()  
							
							 
							
							... 
							
							
							
							Signed-off-by: Stephen Solka <stephen0q@gmail.com> 
							
						 
						
							2019-01-02 16:59:48 -06:00  
						
					 
				
					
						
							
							
								 
								Stephen Solka
							
						 
						
							 
							
							
							
								
							
								c3185a4cdb 
								
							
								 
							
						 
						
							
							
								
								breaking changes from expect upgrade  
							
							 
							
							... 
							
							
							
							Signed-off-by: Stephen Solka <stephen0q@gmail.com> 
							
						 
						
							2019-01-02 16:59:48 -06:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								22ff76e6b7 
								
							
								 
							
						 
						
							
							
								
								Add error to UI when group member list fails to load  
							
							 
							
							... 
							
							
							
							Signed-off-by: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2018-12-04 18:46:15 -06:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								5fc25fd6ba 
								
							
								 
							
						 
						
							
							
								
								Only mark group as failed to load for summary  
							
							 
							
							... 
							
							
							
							Currently, any error in the `GroupStore`s several requests can cause the whole
`GroupView` component to hide and be mark the group as failed to load.
Since it is known that group members may fail to load in some cases, let's only
show failed to load for the whole group when the summary fails.
This also strengthens the `GroupView` test by ensuring we wait for multiple
updates for checking results.
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2018-12-04 18:32:16 -06:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								734a7ef6c8 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2018-11-13 09:34:54 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								e951a22d31 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2018-09-18 17:09:14 +02:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a07799879c 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2018-09-04 18:50:18 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								cb84feefa9 
								
							
								 
							
						 
						
							
							
								
								Add stub for getVisibleRooms()  
							
							 
							
							... 
							
							
							
							Fixes the tests 
							
						 
						
							2018-08-23 12:14:52 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								90fc15ff3e 
								
							
								 
							
						 
						
							
							
								
								adjust room constructor  
							
							 
							
							
							
						 
						
							2018-08-07 15:33:37 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								b9bbb7ee16 
								
							
								 
							
						 
						
							
							
								
								pass in userId with room in test  
							
							 
							
							
							
						 
						
							2018-08-02 11:40:56 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Windels
							
						 
						
							 
							
							
							
								
							
								34cb89e86a 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2018-07-25 16:10:49 +02:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
								
								
							
							
								
							
								021409aafe 
								
									
								
							
								 
							
						 
						
							
							
								
								apply review feedback from @lukebarnard1  
							
							 
							
							... 
							
							
							
							(cherry picked from commit 37d4bce)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-07-09 19:54:57 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								efdc5430d7 
								
							
								 
							
						 
						
							
							
								
								merge develop  
							
							 
							
							
							
						 
						
							2018-07-09 17:50:07 +01:00  
						
					 
				
					
						
							
							
								 
								Akihiko Odaki
							
						 
						
							 
							
							
							
								
							
								35ab573bc5 
								
							
								 
							
						 
						
							
							
								
								Update sinon to 5.0.7  
							
							 
							
							
							
						 
						
							2018-05-21 18:44:00 +09:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								b616fd025e 
								
							
								 
							
						 
						
							
							
								
								comment out all the tests for now  
							
							 
							
							
							
						 
						
							2018-05-20 23:34:06 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								d799b7e424 
								
							
								 
							
						 
						
							
							
								
								refactor roundtripping into a single place  
							
							 
							
							... 
							
							
							
							and fix isRichTextEnabled to be correctly camelCased everywhere... 
							
						 
						
							2018-05-20 16:30:39 +01:00