Merge pull request #61 from VisualTesting/feature/integration-test

Moving out the rest of the storage integration tests

Author: elicwhite

test/storage-integration-test.js

@@ -262,6 +262,172 @@ TestStorage.prototype = {
           });
         });
       });
+
+      describe('#getBuildInfo', function() {
+        describe('with invalid args', function() {
+          it('should throw with non string id', function() {
+            assert.throws(function() {
+              return storage.getBuildInfo({
+                project: 'project',
+                build: 4
+              });
+            });
+          });
+        });
+
+        describe('with valid args', function() {
+          var projectSettings;
+
+          beforeEach(function() {
+            projectSettings = {};
+          });
+
+          it('should reject non existent project', function() {
+            return assert.isRejected(storage.getBuildInfo({
+              project: 'project',
+              build: 'foo'
+            }));
+          });
+
+          it('should reject non existent build', function() {
+            return storage.createProject(projectSettings)
+            .then(function(project) {
+              return assert.isRejected(storage.getBuildInfo({
+                project: project.project,
+                build: 'foo'
+              }), /Unknown Build/);
+            });
+          });
+
+          it('should return build info', function() {
+            var buildOptions = {
+              head: 'head',
+              base: 'base',
+              numBrowsers: 3
+            };
+
+            var buildId;
+
+            return storage.createProject(projectSettings)
+            .then(function(project) {
+              buildOptions.project = project.project;
+
+              return storage.startBuild(buildOptions);
+            })
+            .then(function(data) {
+              buildId = data.build;
+            })
+            .then(function() {
+              return storage.getBuildInfo({
+                project: buildOptions.project,
+                build: buildId
+              });
+            })
+            .then(function(data) {
+              assert.isObject(data);
+              assert.isString(data.build);
+              assert.equal(data.status, 'pending');
+              assert.isUndefined(data.project);
+
+              delete buildOptions.project;
+              assert.shallowDeepEqual(data, buildOptions);
+            });
+          });
+        });
+      });
+
+      describe('#updateBuildInfo', function() {
+        var projectId;
+        var buildId;
+
+        beforeEach(function() {
+          return storage.createProject({})
+          .then(function(project) {
+            projectId = project.project;
+          })
+          .then(function() {
+            var buildOptions = {
+              project: projectId,
+              head: 'head',
+              base: 'base',
+              numBrowsers: 3
+            };
+
+            return storage.startBuild(buildOptions);
+          })
+          .then(function(data) {
+            buildId = data.build;
+          });
+        });
+
+        describe('with success', function() {
+          beforeEach(function() {
+            return storage.updateBuildInfo({
+              project: projectId,
+              build: buildId,
+              status: 'success'
+            });
+          });
+
+          it('should write success', function() {
+            return storage.getBuildInfo({
+              project: projectId,
+              build: buildId
+            })
+            .then(function(buildInfo) {
+              assert.equal(buildInfo.status, 'success');
+            });
+          });
+
+          it('should not have diffs', function() {
+            return storage.getBuildInfo({
+              project: projectId,
+              build: buildId
+            })
+            .then(function(buildInfo) {
+              assert.isUndefined(buildInfo.diffs);
+            });
+          });
+        });
+
+        describe('with failure', function() {
+          var newBuildInfo;
+
+          beforeEach(function() {
+            newBuildInfo = {
+              project: projectId,
+              build: buildId,
+              status: 'failed',
+              diffs: {
+                Chrome: ['image1.png,', 'image2.png'],
+                Firefox: ['image1.png']
+              }
+            };
+
+            return storage.updateBuildInfo(newBuildInfo);
+          });
+
+          it('should write failure', function() {
+            return storage.getBuildInfo({
+              project: projectId,
+              build: buildId
+            })
+            .then(function(buildInfo) {
+              assert.equal(buildInfo.status, 'failed');
+            });
+          });
+
+          it('should have diffs', function() {
+            return storage.getBuildInfo({
+              project: projectId,
+              build: buildId
+            })
+            .then(function(buildInfo) {
+              assert.deepEqual(buildInfo.diffs, newBuildInfo.diffs);
+            });
+          });
+        });
+      });
     });
   }
 };

test/storage-test.js

@@ -330,172 +330,6 @@ describe('module/storage', function() {
     });
   });
 
-  describe('#getBuildInfo', function() {
-    describe('with invalid args', function() {
-      it('should throw with non string id', function() {
-        assert.throws(function() {
-          return storage.getBuildInfo({
-            project: 'project',
-            build: 4
-          });
-        });
-      });
-    });
-
-    describe('with valid args', function() {
-      var projectSettings;
-
-      beforeEach(function() {
-        projectSettings = {};
-      });
-
-      it('should reject non existent project', function() {
-        return assert.isRejected(storage.getBuildInfo({
-          project: 'project',
-          build: 'foo'
-        }));
-      });
-
-      it('should reject non existent build', function() {
-        return storage.createProject(projectSettings)
-        .then(function(project) {
-          return assert.isRejected(storage.getBuildInfo({
-            project: project.project,
-            build: 'foo'
-          }), /Unknown Build/);
-        });
-      });
-
-      it('should return build info', function() {
-        var buildOptions = {
-          head: 'head',
-          base: 'base',
-          numBrowsers: 3
-        };
-
-        var buildId;
-
-        return storage.createProject(projectSettings)
-        .then(function(project) {
-          buildOptions.project = project.project;
-
-          return storage.startBuild(buildOptions);
-        })
-        .then(function(data) {
-          buildId = data.build;
-        })
-        .then(function() {
-          return storage.getBuildInfo({
-            project: buildOptions.project,
-            build: buildId
-          });
-        })
-        .then(function(data) {
-          assert.isObject(data);
-          assert.isString(data.build);
-          assert.equal(data.status, 'pending');
-          assert.isUndefined(data.project);
-
-          delete buildOptions.project;
-          assert.shallowDeepEqual(data, buildOptions);
-        });
-      });
-    });
-  });
-
-  describe('#updateBuildInfo', function() {
-    var projectId;
-    var buildId;
-
-    beforeEach(function() {
-      return storage.createProject({})
-      .then(function(project) {
-        projectId = project.project;
-      })
-      .then(function() {
-        var buildOptions = {
-          project: projectId,
-          head: 'head',
-          base: 'base',
-          numBrowsers: 3
-        };
-
-        return storage.startBuild(buildOptions);
-      })
-      .then(function(data) {
-        buildId = data.build;
-      });
-    });
-
-    describe('with success', function() {
-      beforeEach(function() {
-        return storage.updateBuildInfo({
-          project: projectId,
-          build: buildId,
-          status: 'success'
-        });
-      });
-
-      it('should write success', function() {
-        return storage.getBuildInfo({
-          project: projectId,
-          build: buildId
-        })
-        .then(function(buildInfo) {
-          assert.equal(buildInfo.status, 'success');
-        });
-      });
-
-      it('should not have diffs', function() {
-        return storage.getBuildInfo({
-          project: projectId,
-          build: buildId
-        })
-        .then(function(buildInfo) {
-          assert.isUndefined(buildInfo.diffs);
-        });
-      });
-    });
-
-    describe('with failure', function() {
-      var newBuildInfo;
-
-      beforeEach(function() {
-        newBuildInfo = {
-          project: projectId,
-          build: buildId,
-          status: 'failed',
-          diffs: {
-            Chrome: ['image1.png,', 'image2.png'],
-            Firefox: ['image1.png']
-          }
-        };
-
-        return storage.updateBuildInfo(newBuildInfo);
-      });
-
-      it('should write failure', function() {
-        return storage.getBuildInfo({
-          project: projectId,
-          build: buildId
-        })
-        .then(function(buildInfo) {
-          assert.equal(buildInfo.status, 'failed');
-        });
-      });
-
-      it('should have diffs', function() {
-        return storage.getBuildInfo({
-          project: projectId,
-          build: buildId
-        })
-        .then(function(buildInfo) {
-          assert.deepEqual(buildInfo.diffs, newBuildInfo.diffs);
-        });
-      });
-    });
-  });
-
   describe('#getBrowsersForSha', function() {
     var project;
     var sha;