Merge remote-tracking branch 'origin/develop' into fix-failing-tests

packages/rocketchat-postcss/plugin/minify-css.js

@@ -198,9 +198,13 @@ class CssToolsMinifier {
 			return false;
 		}
 
+		const minifiedFiles = CssTools.minifyCss(merged.code);
+
 		if (files.length) {
-			files[0].addStylesheet({
-				data: CssTools.minifyCss(merged.code)[0]
+			minifiedFiles.forEach(minified => {
+				files[0].addStylesheet({
+					data: minified
+				});
 			});
 		}
 	}

tests/end-to-end/ui/06-messaging.js

@@ -39,7 +39,7 @@ function messagingTest() {
 		}
 	});
 
-	describe.skip('fileUpload:', ()=> {
+	describe('fileUpload:', ()=> {
 		after(() => {
 		});
 		it('it should send a attachment', () => {
@@ -188,7 +188,7 @@ function messageActionsTest() {
 				});
 			});
 
-			describe.skip('Delete:', () => {
+			describe('Delete:', () => {
 				before(() => {
 					mainContent.sendMessage('Message for Message Delete Tests');
 					mainContent.openMessageActionMenu();

tests/end-to-end/ui/09-channel.js

@@ -289,7 +289,7 @@ describe('[Channel]', ()=> {
 		});
 
 		describe('Members tab usage:', () => {
-			describe.skip('User muted', () => {
+			describe('User muted', () => {
 				before(()=> {
 					flexTab.operateFlexTab('members', true);
 				});
@@ -378,7 +378,7 @@ describe('[Channel]', ()=> {
 				});
 			});
 
-			describe.skip('channel quit and enter', () => {
+			describe('channel quit and enter', () => {
 				it('it should leave the channel', () => {
 					const channel = sideNav.getChannelFromList(`NAME-EDITED-${ publicChannelName }`);
 					channel.click();