Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix toHaveStyleRule support classes with displayName prefix #302

Merged
merged 3 commits into from Apr 9, 2020
Merged

Fix toHaveStyleRule support classes with displayName prefix #302

merged 3 commits into from Apr 9, 2020

Conversation

ghost
Copy link

@ghost ghost commented Feb 6, 2020

Fixes toHaveStyleRule support for classes with a displayName prefix from babel-plugin-styled-components

Closes #290 #294

@ghost ghost requested a review from quantizor February 6, 2020 00:27
@vepor
Copy link

vepor commented Feb 18, 2020

@probablyup any chance to look on this, please 🙏? It blocks us in updating styled-components as we don't have any other legit solution 😞

@@ -68,7 +68,7 @@ const getModifiedClassName = (className, staticClassName, modifier = "") => {
};

const hasClassNames = (classNames, selectors, options) => {
const staticClassNames = classNames.filter(x => x.startsWith("sc-"));
const staticClassNames = classNames.filter(x => /^(\w+-)?sc-\w+/.test(x));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we want the \w+ part at the end

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @vxcamiloxv

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@quantizor
Copy link
Contributor

@vxcamiloxv Could you add a test or two? ty

@ghost
Copy link
Author

ghost commented Apr 9, 2020

@probablyup sure

Copy link
Contributor

@quantizor quantizor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM thanks!

@quantizor quantizor merged commit 4f772cf into styled-components:master Apr 9, 2020
@ghost ghost deleted the fix-displayname-classes branch April 9, 2020 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

toHaveStyleRule does not work with babel-plugin-styled-components
2 participants