Skip to content

Commit

Permalink
Merge pull request #7104 from RocketChat/fix-missing-css
Browse files Browse the repository at this point in the history
[FIX] Fix missing CSS files on production builds
  • Loading branch information
sampaiodiego authored May 29, 2017
2 parents db603a9 + 4d6f3eb commit 62fd831
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
8 changes: 6 additions & 2 deletions packages/rocketchat-postcss/plugin/minify-css.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
});
});
}
}
Expand Down
4 changes: 2 additions & 2 deletions tests/end-to-end/ui/06-messaging.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function messagingTest() {
}
});

describe.skip('fileUpload:', ()=> {
describe('fileUpload:', ()=> {
after(() => {
});
it('it should send a attachment', () => {
Expand Down Expand Up @@ -188,7 +188,7 @@ function messageActionsTest() {
});
});

describe.skip('Delete:', () => {
describe('Delete:', () => {
before(() => {
mainContent.sendMessage('Message for Message Delete Tests');
mainContent.openMessageActionMenu();
Expand Down
4 changes: 2 additions & 2 deletions tests/end-to-end/ui/09-channel.js
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ describe('[Channel]', ()=> {
});

describe('Members tab usage:', () => {
describe.skip('User muted', () => {
describe('User muted', () => {
before(()=> {
flexTab.operateFlexTab('members', true);
});
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit 62fd831

Please sign in to comment.