Fix specs that no longer work after test framework updates

Author: benjaminapetersen

Diff for: test/spec/services/applicationGeneratorSpec.js

@@ -255,77 +255,73 @@ describe("ApplicationGenerator", function(){
     });
 
     it("should generate a BuildConfig for the source", function(){
-      expect(resources.buildConfig).toEqual(
+      var generatedBuildConfig = resources.buildConfig;
+
+      expect(generatedBuildConfig.apiVersion).toEqual('v1');
+      expect(generatedBuildConfig.kind).toEqual('BuildConfig');
+      expect(generatedBuildConfig.metadata.name).toEqual('ruby-hello-world');
+      expect(generatedBuildConfig.metadata.labels).toEqual({
+        "foo" : "bar",
+        "abc" : "xyz"
+      });
+      expect(generatedBuildConfig.metadata.annotations).toEqual({
+        "openshift.io/generated-by": "OpenShiftWebConsole"
+      });
+      expect(generatedBuildConfig.spec.output).toEqual({
+        "to": {
+          "name": "ruby-hello-world:latest",
+          "kind": "ImageStreamTag"
+        }
+      });
+      expect(generatedBuildConfig.spec.source).toEqual({
+        "git": {
+          "ref": "master",
+          "uri": "https://github.com/openshift/ruby-hello-world.git"
+        },
+        "type": "Git"
+      });
+      expect(generatedBuildConfig.spec.strategy.type).toEqual('Source');
+
+      expect(generatedBuildConfig.spec.strategy.sourceStrategy.from.kind).toEqual('ImageStreamTag');
+      expect(generatedBuildConfig.spec.strategy.sourceStrategy.from.name).toEqual('origin-ruby-sample:latest');
+      expect(generatedBuildConfig.spec.strategy.sourceStrategy.from).toEqual({
+        "kind": "ImageStreamTag",
+        "name": "origin-ruby-sample:latest",
+        "namespace": undefined
+      });
+      expect(generatedBuildConfig.spec.strategy.sourceStrategy.env).toEqual([
         {
-            "apiVersion": "v1",
-            "kind": "BuildConfig",
-            "metadata": {
-                "name": "ruby-hello-world",
-                "labels": {
-                  "foo" : "bar",
-                  "abc" : "xyz"
-                },
-                "annotations": {
-                  "openshift.io/generated-by": "OpenShiftWebConsole"
-                }
-            },
-            "spec": {
-                "output": {
-                    "to": {
-                        "name": "ruby-hello-world:latest",
-                        "kind": "ImageStreamTag"
-                    }
-                },
-                "source": {
-                    "git": {
-                        "ref": "master",
-                        "uri": "https://github.com/openshift/ruby-hello-world.git"
-                    },
-                    "type": "Git"
-                },
-                "strategy": {
-                    "type": "Source",
-                    "sourceStrategy" : {
-                      "from": {
-                        "kind": "ImageStreamTag",
-                        "name": "origin-ruby-sample:latest"
-                      },
-                      "env": [
-                        {
-                          "name": "BUILD_ENV_1",
-                          "value": "someValue"
-                        },
-                        {
-                          "name": "BUILD_ENV_2",
-                          "value": "anotherValue"
-                        }
-                      ]
-                    }
-                },
-                "triggers": [
-                    {
-                        "generic": {
-                            "secret": "secret101"
-                        },
-                        "type": "Generic"
-                    },
-                    {
-                        "github": {
-                            "secret": "secret101"
-                        },
-                        "type": "GitHub"
-                    },
-                    {
-                      "imageChange" : {},
-                      "type" : "ImageChange"
-                    },
-                    {
-                        "type": "ConfigChange"
-                    }
-                ]
-            }
-          }
-      );
+          "name": "BUILD_ENV_1",
+          "value": "someValue"
+        },
+        {
+          "name": "BUILD_ENV_2",
+          "value": "anotherValue"
+        }
+      ]);
+
+      expect(generatedBuildConfig.spec.triggers).toEqual([
+        {
+          "generic": {
+              "secret": "secret101"
+          },
+          "type": "Generic"
+        },
+        {
+          "github": {
+              "secret": "secret101"
+          },
+          "type": "GitHub"
+        },
+        {
+          "imageChange" : {},
+          "type" : "ImageChange"
+        },
+        {
+          "type": "ConfigChange"
+        }
+      ]);
+
     });
 
     it("should generate an ImageStream for the build output", function(){

Diff for: test/spec/services/membership/membershipSpec.js

@@ -236,74 +236,49 @@ describe('MembershipService', function() {
     // NOTE: ideally the above tests catch any issues as they do a better job of
     // declaring intent, if not, this test will compare raw output.
     it('should build a map for the tabbed role list interface', function() {
-      expect(MembershipService.mapRolebindingsForUI(roleBindings, keyedRoles))
-        .toEqual([{
-            "kind": "User",
-            "sortOrder": 1,
-            "name": "User",
-            "subjects": {
-                "-jill": {
-                    "name": "jill",
-                    "roles": {
-                        "ClusterRole-admin": {
-                            "kind": "ClusterRole",
-                            "metadata": {
-                                "name": "admin"
-                            }
-                        },
-                        "ClusterRole-view": {
-                            "kind": "ClusterRole",
-                            "metadata": {
-                                "name": "view"
-                            }
-                        }
-                    }
-                },
-                "-jack": {
-                    "name": "jack",
-                    "roles": {
-                        "ClusterRole-edit": {
-                            "kind": "ClusterRole",
-                            "metadata": {
-                                "name": "edit"
-                            }
-                        }
-                    }
-                }
-            }
-        }, {
-            "kind": "Group",
-            "sortOrder": 2,
-            "name": "Group",
-            "subjects": {}
-        }, {
-            "kind": "ServiceAccount",
-            "sortOrder": 3,
-            "description": "Service accounts provide a flexible way to control API access without sharing a regular user’s credentials.",
-            "helpLinkKey": "service_accounts",
-            "name": "ServiceAccount",
-            "subjects": {
-                "fake-project-foo": {
-                    "name": "foo",
-                    "namespace": "fake-project",
-                    "roles": {}
-                }
-            }
-        }, {
-            "kind": "SystemUser",
-            "sortOrder": 4,
-            "description": "System users are virtual users automatically provisioned by the system.",
-            "helpLinkKey": "users_and_groups",
-            "name": "SystemUser",
-            "subjects": {}
-        }, {
-            "kind": "SystemGroup",
-            "sortOrder": 5,
-            "description": "System groups are virtual groups automatically provisioned by the system.",
-            "helpLinkKey": "users_and_groups",
-            "name": "SystemGroup",
-            "subjects": {}
-        }]);
+
+      var mappedRoleBindings = MembershipService.mapRolebindingsForUI(roleBindings, keyedRoles);
+      var userBinding = mappedRoleBindings[0];
+      var groupBinding = mappedRoleBindings[1];
+      var serviceAccountBinding = mappedRoleBindings[2];
+      var systemUserBinding = mappedRoleBindings[3];
+      var systemGroupBinding = mappedRoleBindings[4];
+
+      expect(userBinding.kind).toEqual('User');
+      expect(userBinding.sortOrder).toEqual(1);
+      expect(userBinding.name).toEqual('User');
+      expect(_.size(userBinding.subjects)).toEqual(2);
+      expect(_.map(userBinding.subjects, 'name')).toEqual(['jill', 'jack']);
+      expect( _.keys(userBinding.subjects['-jill'].roles) ).toEqual(['ClusterRole-admin', 'ClusterRole-view']);
+      expect( _.map(userBinding.subjects['-jill'].roles, 'metadata.name') ).toEqual(['admin', 'view']);
+      expect( _.keys(userBinding.subjects['-jack'].roles) ).toEqual(['ClusterRole-edit']);
+      expect( _.map(userBinding.subjects['-jack'].roles, 'metadata.name') ).toEqual(['edit']);
+
+      expect(groupBinding).toEqual({
+        kind: 'Group',
+        sortOrder: 2,
+        name: 'Group',
+        subjects: {}
+      });
+
+      expect(serviceAccountBinding.kind).toEqual('ServiceAccount');
+      expect(serviceAccountBinding.sortOrder).toEqual(3);
+      expect(serviceAccountBinding.description).toEqual('Service accounts provide a flexible way to control API access without sharing a regular user’s credentials.');
+      expect(serviceAccountBinding.name).toEqual('ServiceAccount');
+      expect(serviceAccountBinding.helpLinkKey).toEqual('service_accounts');
+      expect(serviceAccountBinding.subjects['fake-project-foo'].name).toEqual('foo');
+      expect(serviceAccountBinding.subjects['fake-project-foo'].namespace).toEqual('fake-project');
+
+      expect(systemUserBinding.kind).toEqual('SystemUser');
+      expect(systemUserBinding.sortOrder).toEqual(4);
+      expect(systemUserBinding.description).toEqual('System users are virtual users automatically provisioned by the system.');
+      expect(systemUserBinding.helpLinkKey).toEqual('users_and_groups');
+
+      expect(systemGroupBinding.kind).toEqual('SystemGroup');
+      expect(systemGroupBinding.sortOrder).toEqual(5);
+      expect(systemGroupBinding.description).toEqual('System groups are virtual groups automatically provisioned by the system.');
+      expect(systemGroupBinding.helpLinkKey).toEqual('users_and_groups');
+
     });
   });