Merge pull request patternfly#272 from priley86/fix-tests

bootstrap-select tests

Author: dlabrecq

Gruntfile.js

@@ -129,7 +129,7 @@ module.exports = function (grunt) {
             'lib/bootstrap-combobox/js/bootstrap-combobox.js',
             'lib/bootstrap-datepicker/dist/js/bootstrap-datepicker.js',
             'lib/bootstrap-select/js/bootstrap-select.js',
-            'lib/bootstrap-treeview/src/js/bootstrap-treeview.js',
+            'lib/patternfly-bootstrap-treeview/src/js/bootstrap-treeview.js',
             'lib/c3/c3.js',
             'lib/d3/d3.js',
             'lib/patternfly/dist/js/patternfly.js',

bower.json

@@ -39,7 +39,7 @@
     "angular-sanitize": "1.3.0 - 1.5.*",
     "angular-bootstrap": "0.13.x",
     "lodash": "3.x",
-    "patternfly": "~3.7.0"
+    "patternfly": "~3.8.0"
   },
   "devDependencies": {
     "angular-mocks": "1.3.0 - 1.5.*"

test/charts/heatmap/heatmap.spec.js

@@ -54,7 +54,8 @@ describe('Directive: pfHeatmap', function() {
     expect(tooltip).toBe('Node 8 : My OpenShift Provider<br>96% : 96 Used of 100 Total<br>4 Available');
 
     color = block.attr('style');
-    expect(color.trim()).toBe('fill: #ce0000;');
+    var result = color.trim() == 'fill: #ce0000;' || color.trim() == 'fill: rgb(206, 0, 0);';
+    expect(result).toBe(true);
   });
 
   it("should block color based on color pattern overrides", function() {
@@ -67,7 +68,9 @@ describe('Directive: pfHeatmap', function() {
     block = angular.element(element).find('.heatmap-pf-svg').children().first();
 
     color = block.attr('style');
-    expect(color.trim()).toBe('fill: #ff0000;');
+
+    var result = color.trim() == 'fill: #ff0000;' || color.trim() == 'fill: rgb(255, 0, 0);';
+    expect(result).toBe(true);
   });
 
   it("should set color based on threshold overrides", function() {
@@ -78,7 +81,9 @@ describe('Directive: pfHeatmap', function() {
     element = compileChart('<div pf-heatmap chart-title="title" data="data" legend-labels="legendLabels" heatmap-color-pattern="heatmapColorPattern" thresholds="thresholds"></div>',$scope);
     block = angular.element(element).find('.heatmap-pf-svg').children().first();
     color = block.attr('style');
-    expect(color.trim()).toBe('fill: #ce0000;');
+
+    var result = color.trim() == 'fill: #ce0000;' || color.trim() == 'fill: rgb(206, 0, 0);';
+    expect(result).toBe(true);
   });
 
   it("should show a legend by default", function() {

test/select/select.spec.js

@@ -30,7 +30,7 @@ describe('pf-select', function () {
       expect(select.text()).toBe('abc');
       expect(select).toEqualSelect(['a', ['b'], 'c']);
 
-      var bsSelect = angular.element(select).siblings('.bootstrap-select');
+      var bsSelect = angular.element(select).siblings('.dropdown-menu');
       var bsSelItems = bsSelect.find('li');
       expect(bsSelItems.length).toBe($scope.options.length);
       expect(bsSelItems.text()).toBe('abc');
@@ -49,7 +49,7 @@ describe('pf-select', function () {
       expect(select.text()).toBe('abc');
       expect(select).toEqualSelect([['a'], 'b', 'c']);
 
-      var bsSelect = angular.element(select).siblings('.bootstrap-select');
+      var bsSelect = angular.element(select).siblings('.dropdown-menu');
       var bsSelItems = bsSelect.find('li');
       expect(bsSelItems.length).toBe($scope.options.length);
       expect(bsSelItems.text()).toBe('abc');
@@ -63,7 +63,7 @@ describe('pf-select', function () {
       expect(select.text()).toBe('abcd');
       expect(select).toEqualSelect([['a'], 'b', 'c', 'd']);
 
-      bsSelect = angular.element(select).siblings('.bootstrap-select');
+      bsSelect = angular.element(select).siblings('.dropdown-menu');
       bsSelItems = bsSelect.find('li');
       expect(bsSelItems.length).toBe($scope.options.length);
       expect(bsSelItems.text()).toBe('abcd');
@@ -78,7 +78,7 @@ describe('pf-select', function () {
       expect(select.text()).toBe('abc');
       expect(select).toEqualSelect([['a'], 'b', 'c']);
 
-      var bsSelect = angular.element(select).siblings('.bootstrap-select');
+      var bsSelect = angular.element(select).siblings('.dropdown-menu');
       var bsSelItems = bsSelect.find('li');
       expect(bsSelItems.length).toBe($scope.options.length);
       expect(bsSelItems.text()).toBe('abc');