From 1850abbd1c1a1b9a911dcff1f13123fbd2a32ea5 Mon Sep 17 00:00:00 2001
From: oisezrg <--->
Date: Fri, 29 Dec 2017 08:16:17 +0100
Subject: [PATCH 1/2] camelize double-dashes regex, tests fixed

---
 src/transformTokens.js         | 2 +-
 test/api/camelCase.js          | 2 +-
 test/api/generateScopedName.js | 2 +-
 test/api/hashPrefix.js         | 2 +-
 test/preset/index.js           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/transformTokens.js b/src/transformTokens.js
index d93dcf8..aadbd1b 100644
--- a/src/transformTokens.js
+++ b/src/transformTokens.js
@@ -36,7 +36,7 @@ exports.transformTokens = transformTokens;
  * @return {string}
  */
 function camelizeDashes(str) {
-  return str.replace(/-(\w)/g, (m, letter) => letter.toUpperCase());
+  return str.replace(/-+(\w)/g, (m, letter) => letter.toUpperCase());
 }
 
 /**
diff --git a/test/api/camelCase.js b/test/api/camelCase.js
index 6d5faa7..94194b9 100644
--- a/test/api/camelCase.js
+++ b/test/api/camelCase.js
@@ -23,7 +23,7 @@ suite('api/camelCase', () => {
     test('should replace keys with dashes by its camel-cased equivalent', () => {
       const tokens = require('./fixture/bem.css');
       assert.deepEqual(tokens, {
-        'block__element-Modifier': '_test_api_fixture_bem__block__element--modifier',
+        'block__elementModifier': '_test_api_fixture_bem__block__element--modifier',
       });
     });
 
diff --git a/test/api/generateScopedName.js b/test/api/generateScopedName.js
index a6d092e..95b3da0 100644
--- a/test/api/generateScopedName.js
+++ b/test/api/generateScopedName.js
@@ -41,7 +41,7 @@ suite('api/generateScopedName', () => {
     let tokens;
 
     test('should return tokens with id', () => assert.deepEqual(tokens, {
-      color: 'oceanic__color___1GAeQ',
+      color: 'oceanic__color___2YUy6',
     }));
 
     setup(() => {
diff --git a/test/api/hashPrefix.js b/test/api/hashPrefix.js
index 87fdb7a..c7de5c9 100644
--- a/test/api/hashPrefix.js
+++ b/test/api/hashPrefix.js
@@ -8,7 +8,7 @@ suite('api/hashPrefix', () => {
     let tokens;
 
     test('should return tokens with prefixed id', () => assert.deepEqual(tokens, {
-      color: 'oceanic__color___3xlBZ',
+      color: 'oceanic__color___3_npr',
     }));
 
     setup(() => {
diff --git a/test/preset/index.js b/test/preset/index.js
index 90f7b64..beeb9d1 100644
--- a/test/preset/index.js
+++ b/test/preset/index.js
@@ -7,7 +7,7 @@ suite('css-modules-require-hook/preset', () => {
       const tokens = require('./fixture/oceanic.css');
 
       assert.deepEqual(tokens, {
-        color: 'oceanic__color___1sqWL',
+        color: 'oceanic__color___1B_RT',
       });
     });
 

From 60e04ed1e78f97232839b6b865bf111925eb2960 Mon Sep 17 00:00:00 2001
From: oisezrg <--->
Date: Fri, 29 Dec 2017 08:26:55 +0100
Subject: [PATCH 2/2] tests fix

---
 test/api/generateScopedName.js | 4 ++--
 test/api/hashPrefix.js         | 4 ++--
 test/preset/index.js           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/api/generateScopedName.js b/test/api/generateScopedName.js
index 95b3da0..c39faab 100644
--- a/test/api/generateScopedName.js
+++ b/test/api/generateScopedName.js
@@ -8,7 +8,7 @@ suite('api/generateScopedName', () => {
     let args;
     let tokens;
 
-    const processor = spy(function (selector, filepath, source) {
+    const processor = spy((selector, filepath, source) => {
       args = [selector, filepath, source];
       return selector;
     });
@@ -41,7 +41,7 @@ suite('api/generateScopedName', () => {
     let tokens;
 
     test('should return tokens with id', () => assert.deepEqual(tokens, {
-      color: 'oceanic__color___2YUy6',
+      color: 'oceanic__color___1GAeQ',
     }));
 
     setup(() => {
diff --git a/test/api/hashPrefix.js b/test/api/hashPrefix.js
index c7de5c9..a2a5ec4 100644
--- a/test/api/hashPrefix.js
+++ b/test/api/hashPrefix.js
@@ -2,13 +2,13 @@ const detachHook = require('../sugar').detachHook;
 const dropCache = require('../sugar').dropCache;
 
 suite('api/hashPrefix', () => {
-  let samples = [];
+  const samples = [];
 
   suite('using string pattern and hashPrefix', () => {
     let tokens;
 
     test('should return tokens with prefixed id', () => assert.deepEqual(tokens, {
-      color: 'oceanic__color___3_npr',
+      color: 'oceanic__color___3xlBZ',
     }));
 
     setup(() => {
diff --git a/test/preset/index.js b/test/preset/index.js
index beeb9d1..90f7b64 100644
--- a/test/preset/index.js
+++ b/test/preset/index.js
@@ -7,7 +7,7 @@ suite('css-modules-require-hook/preset', () => {
       const tokens = require('./fixture/oceanic.css');
 
       assert.deepEqual(tokens, {
-        color: 'oceanic__color___1B_RT',
+        color: 'oceanic__color___1sqWL',
       });
     });