From 00fe70a44d9caf49ff32782cd900d08ef82498d9 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Fri, 26 May 2017 17:51:59 -0300
Subject: [PATCH 1/2] Fix missing CSS files on production builds

---
 packages/rocketchat-postcss/plugin/minify-css.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-postcss/plugin/minify-css.js b/packages/rocketchat-postcss/plugin/minify-css.js
index f4cf60d20c90..e102bfe1d96a 100644
--- a/packages/rocketchat-postcss/plugin/minify-css.js
+++ b/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
+				});
 			});
 		}
 	}

From 4d6f3ebe85efebf81f1ff21ca1a0d4703b2f02f4 Mon Sep 17 00:00:00 2001
From: Karl Prieb <karlprieb@gmail.com>
Date: Fri, 26 May 2017 18:24:38 -0300
Subject: [PATCH 2/2] unskip sweetalert tests

---
 tests/end-to-end/ui/06-messaging.js | 4 ++--
 tests/end-to-end/ui/09-channel.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/end-to-end/ui/06-messaging.js b/tests/end-to-end/ui/06-messaging.js
index 702f23606e5d..89cc6d9b4af3 100644
--- a/tests/end-to-end/ui/06-messaging.js
+++ b/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();
diff --git a/tests/end-to-end/ui/09-channel.js b/tests/end-to-end/ui/09-channel.js
index 12049f942b64..acbdd3d10c6a 100644
--- a/tests/end-to-end/ui/09-channel.js
+++ b/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();