Set dateFormat in test to avoid language issues on BrowserStack.

pushtell · May 19, 2016 · c103585 · c103585
1 parent 9fdb4b3
commit c103585
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 53 deletions.
diff --git a/test/core.test.jsx b/test/core.test.jsx
@@ -130,7 +130,7 @@ describe("Date Picker", function() {
       },
       render: function(){
         return <div>
-          <DatePicker id={id} onChange={this.handleChange} />
+          <DatePicker id={id} onChange={this.handleChange} dateFormat="MM/DD/YYYY" />
         </div>;
       }
     });

diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -24,63 +24,63 @@ module.exports = function (karma) {
         base: 'Chrome',
         flags: ['--disable-local-storage']
       },
-//      bs_windows_7_ie_9: {
-//        base: 'BrowserStack',
-//        os: 'Windows',
-//        os_version: '7',
-//        browser: 'ie',
-//        browser_version : '9.0'
-//      },
-//      bs_windows_7_ie_10: {
-//        base: 'BrowserStack',
-//        os: 'Windows',
-//        os_version: '7',
-//        browser: 'ie',
-//        browser_version : '10.0'
-//      },
-//      bs_windows_7_ie_11: {
-//        base: 'BrowserStack',
-//        os: 'Windows',
-//        os_version: '7',
-//        browser: 'ie',
-//        browser_version : '11.0'
-//      },
-//      bs_windows_7_opera_latest: {
-//        base: 'BrowserStack',
-//        os: 'Windows',
-//        os_version: '7',
-//        browser: 'opera',
-//        browser_version : 'latest'
-//      },
+      bs_windows_7_ie_9: {
+        base: 'BrowserStack',
+        os: 'Windows',
+        os_version: '7',
+        browser: 'ie',
+        browser_version : '9.0'
+      },
+      bs_windows_7_ie_10: {
+        base: 'BrowserStack',
+        os: 'Windows',
+        os_version: '7',
+        browser: 'ie',
+        browser_version : '10.0'
+      },
+      bs_windows_7_ie_11: {
+        base: 'BrowserStack',
+        os: 'Windows',
+        os_version: '7',
+        browser: 'ie',
+        browser_version : '11.0'
+      },
+      bs_windows_7_opera_latest: {
+        base: 'BrowserStack',
+        os: 'Windows',
+        os_version: '7',
+        browser: 'opera',
+        browser_version : 'latest'
+      },
       bs_windows_7_firefox_latest: {
         base: 'BrowserStack',
         os: 'Windows',
         os_version: '7',
         browser: 'firefox',
         browser_version : 'latest'
       },
-//      bs_windows_7_chrome_latest: {
-//        base: 'BrowserStack',
-//        os: 'Windows',
-//        os_version: '7',
-//        browser: 'chrome',
-//        browser_version : 'latest'
-//      },
-//      bs_osx_yosemite_safari: {
-//        base: 'BrowserStack',
-//        os: 'OS X',
-//        os_version: 'Yosemite',
-//        browser: 'safari',
-//        browser_version : 'latest'
-//      },
-//      bs_ios_8_default: {
-//        base: 'BrowserStack',
-//        os_version: "8.3",
-//        device: "iPhone 6",
-//        browser_version: null,
-//        os: "ios",
-//        browser: "iphone"
-//      }
+      bs_windows_7_chrome_latest: {
+        base: 'BrowserStack',
+        os: 'Windows',
+        os_version: '7',
+        browser: 'chrome',
+        browser_version : 'latest'
+      },
+      bs_osx_yosemite_safari: {
+        base: 'BrowserStack',
+        os: 'OS X',
+        os_version: 'Yosemite',
+        browser: 'safari',
+        browser_version : 'latest'
+      },
+      bs_ios_8_default: {
+        base: 'BrowserStack',
+        os_version: "8.3",
+        device: "iPhone 6",
+        browser_version: null,
+        os: "ios",
+        browser: "iphone"
+      }
     },
     reporters: ['dots', 'coverage'],
     coverageReporter: {
@@ -127,8 +127,7 @@ module.exports = function (karma) {
       return key.indexOf("bs_") !== -1;
     });
   } else {
-    //options.browsers = ['Chrome'];
-    options.browsers = ['Firefox'];
+    options.browsers = ['Chrome', 'Firefox'];
   }
   if(process.env.COVERALLS_REPO_TOKEN) {
     options.reporters.push('coveralls');