fixes selector deduction code to handle invalid selectors #2

GGAlanSmithee · Oct 20, 2015 · 0827f46 · 0827f46
1 parent 6940a73
commit 0827f46
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/core/selector-type.js b/src/core/selector-type.js
@@ -29,7 +29,8 @@ const Regex = {
     None : '',
     Invalid : '',
     Universal : /\*/,
-    Type : /^[A-Za-z]/,
+    TypeCategory : /^[A-Za-z]+/,
+    Type : /^[A-Za-z]+$/,
     TypeClass : /^[A-Za-z]+\.[A-Za-z]+$/,
     TypeId : /^[A-Za-z]+\#[A-Za-z]+$/,
     Class : /^\.[A-Za-z]+$/,
@@ -48,16 +49,15 @@ const Regex = {
  * @return {SelectorType} type
  */
 export default function getType(selector) {
-    console.log(selector, /^.[A-Za-z]+$/.test(selector));
-
     if (selector === '*') {
         return SelectorType.Universal;
     }
 
-    if (Regex.Type.test(selector)) {
+    if (Regex.TypeCategory.test(selector)) {
         return Regex.TypeClass.test(selector) ? SelectorType.TypeClass :
                Regex.TypeId.test(selector) ? SelectorType.TypeId :
-               SelectorType.Type;
+               Regex.Type.test(selector) ? SelectorType.Type :
+               SelectorType.Invalid;
     }
 
     return Regex.Class.test(selector) ? SelectorType.Class :

diff --git a/test/get-type.js b/test/get-type.js
@@ -4,6 +4,10 @@ import getType, { SelectorType } from '../src/core/selector-type';
 
 describe('getType(selector)', function() {
     describe('Selectors', () => {
+        it('Invalid selector (E E)', () => {
+            expect(getType('e e')).to.equal(SelectorType.Invalid);
+        });
+
         it('Type selector (E)', () => {
             expect(getType('div')).to.equal(SelectorType.Type);
         });