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  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
							
								
							
								734a7ef6c8 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2018-11-13 09:34:54 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								10519f9465 
								
							
								 
							
						 
						
							
							
								
								Fix the tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2017-11-05 14:56:41 -07:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								ae10a11ac4 
								
							
								 
							
						 
						
							
							
								
								Convert synced settings to granular settings  
							
							 
							
							... 
							
							
							
							Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2017-10-29 01:43:52 -06:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								d3f9a3aeb5 
								
							
								 
							
						 
						
							
							
								
								Run eslint --fix  
							
							 
							
							... 
							
							
							
							Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase. 
							
						 
						
							2017-10-11 17:56:17 +01:00  
						
					 
				
					
						
							
							
								 
								turt2live
							
						 
						
							 
							
							
							
								
							
								0363f73e28 
								
							
								 
							
						 
						
							
							
								
								Fix the MessagePanel test  
							
							 
							
							... 
							
							
							
							Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2017-09-14 20:57:28 -06:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								f036fd1d0f 
								
									
								
							
								 
							
						 
						
							
							
								
								first attempt at stubbing tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-07-21 19:16:30 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								22757cfcd3 
								
							
								 
							
						 
						
							
							
								
								Inject MatrixClient into React context in tests  
							
							 
							
							... 
							
							
							
							Now that EventTile expects MatrixClient in the context, we had better provide
it. 
							
						 
						
							2016-11-14 18:22:56 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								78c3d5943a 
								
							
								 
							
						 
						
							
							
								
								Fix a load of warnings in the tests  
							
							 
							
							... 
							
							
							
							Stub things out to make the tests not throw warnings, so we can see the actual
problems. 
							
						 
						
							2016-10-11 14:20:40 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								dcd81da856 
								
							
								 
							
						 
						
							
							
								
								Fix test failures introduced by last PR  
							
							 
							
							
							
						 
						
							2016-04-19 21:10:23 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								a2168efcda 
								
							
								 
							
						 
						
							
							
								
								Correctly restore MatrixClientPeg after each test case  
							
							 
							
							
							
						 
						
							2016-04-07 16:47:17 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								b6e4e9caf3 
								
							
								 
							
						 
						
							
							
								
								Fix a bug where we tried to show two ghost read markers at once.  
							
							 
							
							... 
							
							
							
							I think this was responsible for the readmarker just disappearing rather than
animating.
While we're here, decrease the delay on the animation, and instead make it take
slightly longer to disappear. 
							
						 
						
							2016-03-31 18:27:46 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								25b35a09b9 
								
							
								 
							
						 
						
							
							
								
								Clean up some redundancy in the MessagePanel test  
							
							 
							
							
							
						 
						
							2016-03-31 17:01:11 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								3ba7f9f23a 
								
							
								 
							
						 
						
							
							
								
								Fix failing test  
							
							 
							
							... 
							
							
							
							DOM styles are strings, not numbers 
							
						 
						
							2016-03-31 01:01:49 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								dc5c0928b2 
								
							
								 
							
						 
						
							
							
								
								Some basic tests for MessagePanel  
							
							 
							
							... 
							
							
							
							Check that it puts the read marker in the right place, and check that the
animation works.
... all of which has been surprisingly painful. 
							
						 
						
							2016-03-31 00:48:46 +01:00