//import user
//import screenshots


describe('User', function() {

  beforeEach(function () {
  });

  describe('#createUser', function() {
    it('should create a new user', function(){
      createUser("Ruben", "1010");
      //var user = new User({username: 'Ruben', password: '1010'});
      //user.save();
      expect(User.find().length).to.equal(1);
    });
  });

  describe('#createGallery', function() {
    it('should create a new gallery for a specific user'){
      var user = createUser("Ruben", "1010");
      var gallery = user.createGallery("Design");
      expect(user).to.equal()
    };
  });
  
  describe('#getGalleries', function() {
    it('should serve all galleries from a specific user'){
      var user = createUser("Ruben", "1010");
      var gallery = user.createGallery();
      var gallery2 = user.createGallery();
      expect(user.getGalleries()).to.equal([gallery, gallery2]);
    };
  })

  describe('#getGallery', function() {
    it('should serve a certain gallery from a specific user'){
      var user = createUser("Ruben", "1010");
      var gallery = user.createGallery();
      var gallery2 = user.createGallery();
      expect().to.equal(gallery);
    };
  });

  //describe('', function() {
    //it('should create a new gallery for a specific user'){

    //};
  //})


});

@@ -86,14 +86,13 @@
 tion
- 
 () %7B%0A
+
   %7D)
@@ -178,16 +178,17 @@
 nction()
+ 
 %7B%0A      
@@ -456,33 +456,45 @@
 a specific user'
-)
+, function() 
 %7B%0A      var user
@@ -605,29 +605,58 @@
 equal()%0A
+      user.createGallery();%0A
     %7D
+)
 ;%0A  %7D);%0A
   %0A  des
@@ -651,11 +651,9 @@
 %7D);%0A
-  
 %0A
+
   de
@@ -725,19 +725,18 @@
 leries f
+o
 r
-om
  a speci
@@ -736,33 +736,45 @@
 a specific user'
-)
+, function() 
 %7B%0A      var user
@@ -960,22 +960,24 @@
 );%0A    %7D
+)
 ;%0A  %7D)
+;
 %0A%0A  desc
@@ -1069,17 +1069,29 @@
 ic user'
-)
+, function() 
 %7B%0A      
@@ -1249,21 +1249,22 @@
 llery);%0A
-
     %7D
+)
 ;%0A  %7D);%0A

fix merge conflicts