spec fixes

openstax · Oct 21, 2016 · a4048cd · a4048cd
1 parent 8b9c280
commit a4048cd
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 34 deletions.
diff --git a/spec/controllers/api/v1/application_groups_controller_spec.rb b/spec/controllers/api/v1/application_groups_controller_spec.rb
@@ -155,7 +155,8 @@
           is_public: false,
           owners: [
             {group_id: group_2.id,
-             user: {id: user_1.id, username: user_1.username, uuid: user_1.uuid}}
+             user: {id: user_1.id, username: user_1.username, uuid: user_1.uuid,
+                    faculty_status: user_1.faculty_status}}
           ],
           members: [],
           nestings: [],

diff --git a/spec/controllers/api/v1/application_users_controller_spec.rb b/spec/controllers/api/v1/application_users_controller_spec.rb
@@ -57,7 +57,8 @@
           first_name: bob_brown.first_name,
           last_name: bob_brown.last_name,
           full_name: bob_brown.full_name,
-          uuid: bob_brown.uuid
+          uuid: bob_brown.uuid,
+          faculty_status: bob_brown.faculty_status
         }, unread_updates: 0
       }.to_json
       expect(response.body).to eq(expected_response)
@@ -97,7 +98,8 @@
             first_name: user_2.first_name,
             last_name: user_2.last_name,
             full_name: user_2.full_name,
-            uuid: user_2.uuid
+            uuid: user_2.uuid,
+            faculty_status: user_2.faculty_status
           }
         ]
       }.to_json
@@ -173,7 +175,8 @@
             first_name: user_2.first_name,
             last_name: user_2.last_name,
             full_name: user_2.full_name,
-            uuid: user_2.uuid
+            uuid: user_2.uuid,
+            faculty_status: user_2.faculty_status
           }
         ]
       }.to_json
@@ -216,7 +219,8 @@
           first_name: user_2.first_name,
           last_name: user_2.last_name,
           full_name: user_2.full_name,
-          uuid: user_2.uuid
+          uuid: user_2.uuid,
+          faculty_status: user_2.faculty_status
         },
         unread_updates: 2
       }].to_json
@@ -242,7 +246,8 @@
           first_name: user_2.first_name,
           last_name: user_2.last_name,
           full_name: user_2.full_name,
-          uuid: user_2.uuid
+          uuid: user_2.uuid,
+          faculty_status: user_2.faculty_status
         },
         unread_updates: 3
       }].to_json
@@ -262,7 +267,8 @@
           first_name: user_2.first_name,
           last_name: user_2.last_name,
           full_name: user_2.full_name,
-          uuid: user_2.uuid
+          uuid: user_2.uuid,
+          faculty_status: user_2.faculty_status
         },
         unread_updates: 2
       }].to_json

diff --git a/spec/controllers/api/v1/group_members_controller_spec.rb b/spec/controllers/api/v1/group_members_controller_spec.rb
@@ -64,7 +64,7 @@
             'members' => [
               {
                 'group_id' => group_1.id,
-                'user' => { 'id' => user_1.id, 'username' => user_1.username, 'uuid' => user_1.uuid }
+                'user' => user_hash(user_1)
               }
             ],
             'nestings' => [],
@@ -95,7 +95,7 @@
           'members' => [
             {
               'group_id' => group_1.id,
-              'user' => { 'id' => user_1.id, 'username' => user_1.username, 'uuid' => user_1.uuid }
+              'user' => user_hash(user_1)
             }
           ],
           'nestings' => [
@@ -136,7 +136,7 @@
           'members' => [
             {
               'group_id' => group_1.id,
-              'user' => { 'id' => user_1.id, 'username' => user_1.username, 'uuid' => user_1.uuid }
+              'user' => user_hash(user_1)
             }
           ],
           'nestings' => [
@@ -163,8 +163,7 @@
             *group_2.group_members.map do |group_member|
               {
                 'group_id' => group_2.id,
-                'user' => { 'id' => group_member.user.id, 'username' => group_member.user.username,
-                            'uuid' => group_member.user.uuid }
+                'user' => user_hash(group_member.user)
               }
             end
           ),
@@ -205,7 +204,7 @@
           'owners' => [],
           'members' => [
             { 'group_id' => group_3.id,
-              'user' => { 'id' => user_1.id, 'username' => user_1.username, 'uuid' => user_1.uuid } }
+              'user' => user_hash(user_1) }
           ],
           'nestings' => [],
           'supertree_group_ids' => [group_3.id],
@@ -261,13 +260,13 @@
           'owners' => [
             {
               'group_id' => group_3.id,
-              'user' => { 'id' => user_1.id, 'username' => user_1.username, 'uuid' => user_1.uuid }
+              'user' => user_hash(user_1)
             }
           ],
           'members' => [
             {
               'group_id' => group_3.id,
-              'user' => { 'id' => user_2.id, 'username' => user_2.username, 'uuid' => user_2.uuid }
+              'user' => user_hash(user_2)
             }
           ],
           'nestings' => [],
@@ -290,13 +289,13 @@
           'is_public' => false,
           'owners' => [
             { 'group_id' => group_1.id,
-              'user' => { 'id' => user_1.id, 'username' => user_1.username, 'uuid' => user_1.uuid }
+              'user' => user_hash(user_1)
             }
           ],
           'members' => [
             {
               'group_id' => group_1.id,
-              'user' => { 'id' => user_1.id, 'username' => user_1.username, 'uuid' => user_1.uuid }
+              'user' => user_hash(user_1)
             }
           ],
           'nestings' => [],
@@ -357,4 +356,13 @@
     end
   end
 
+  def user_hash(user)
+    {
+      'id' => user.id,
+      'username' => user.username,
+      'uuid' => user.uuid,
+      'faculty_status' => user.faculty_status
+    }
+  end
+
 end
diff --git a/spec/controllers/api/v1/group_owners_controller_spec.rb b/spec/controllers/api/v1/group_owners_controller_spec.rb
@@ -63,7 +63,7 @@
             'owners' => [
               {
                 'group_id' => group_1.id,
-                'user' => { 'id' => user_1.id, 'username' => user_1.username, 'uuid' => user_1.uuid }
+                'user' => user_hash(user_1)
               }
             ],
             'members' => [],
@@ -94,7 +94,7 @@
           'owners' => [
             {
               'group_id' => group_1.id,
-              'user' => { 'id' => user_1.id, 'username' => user_1.username, 'uuid' => user_1.uuid }
+              'user' => user_hash(user_1)
             }
           ],
           'members' => [],
@@ -134,8 +134,7 @@
             *group_2.group_owners.map do |group_owner|
               {
                 'group_id' => group_2.id,
-                'user' => { 'id' => group_owner.user.id, 'username' => group_owner.user.username,
-                            'uuid' => group_owner.user.uuid }
+                'user' => user_hash(group_owner.user)
               }
             end
           ),
@@ -173,7 +172,7 @@
           'owners' => [
             {
               'group_id' => group_3.id,
-              'user' => { 'id' => user_1.id, 'username' => user_1.username, 'uuid' => user_1.uuid }
+              'user' => user_hash(user_1)
             }
           ],
           'members' => [],
@@ -232,7 +231,7 @@
             *group_3.owners.map do |owner|
               {
                 'group_id' => group_3.id,
-                'user' => { 'id' => owner.id, 'username' => owner.username, 'uuid' => owner.uuid }
+                'user' => user_hash(owner)
               }
             end
           ),
@@ -262,7 +261,7 @@
             *group_1.owners.map do |owner|
               {
                 'group_id' => group_1.id,
-                'user' => { 'id' => owner.id, 'username' => owner.username, 'uuid' => owner.uuid }
+                'user' => user_hash(owner)
               }
             end
           ),
@@ -329,4 +328,13 @@
     end
   end
 
+  def user_hash(user)
+    {
+      'id' => user.id,
+      'username' => user.username,
+      'uuid' => user.uuid,
+      'faculty_status' => user.faculty_status
+    }
+  end
+
 end
diff --git a/spec/controllers/api/v1/groups_controller_spec.rb b/spec/controllers/api/v1/groups_controller_spec.rb
@@ -57,7 +57,7 @@
         'is_public' => false,
         'members' => [
           { 'group_id' => group_1.id,
-            'user' => { 'id' => user_1.id, 'username' => user_1.username, 'uuid' => user_1.uuid } }
+            'user' => user_hash(user_1) }
         ], 'owners' => [], 'nestings' => [],
         'supertree_group_ids' => [group_1.id],
         'subtree_group_ids' => [group_1.id],
@@ -135,7 +135,7 @@
         'is_public' => true,
         'members' => [
           {'group_id' => group_3.id,
-           'user' => {'id' => user_2.id, 'username' => user_2.username, 'uuid' => user_2.uuid }}
+           'user' => user_hash(user_2)}
         ], 'owners' => [], 'nestings' => [
           'container_group_id' => group_3.id,
           'member_group_id' => group_2.id
@@ -161,7 +161,7 @@
         'is_public' => false,
         'members' => [
           {'group_id' => group_2.id,
-           'user' => {'id' => user_1.id, 'username' => user_1.username, 'uuid' => user_1.uuid }}
+           'user' => user_hash(user_1)}
         ], 'owners' => [], 'nestings' => [],
         'supertree_group_ids' => group_2.supertree_group_ids,
         'subtree_group_ids' => [group_2.id],
@@ -175,7 +175,7 @@
         'is_public' => true,
         'members' => [
           {'group_id' => group_3.id,
-           'user' => {'id' => user_2.id, 'username' => user_2.username, 'uuid' => user_2.uuid }}
+           'user' => user_hash(user_2)}
         ], 'owners' => [], 'nestings' => [
           'container_group_id' => group_3.id,
           'member_group_id' => group_2.id
@@ -206,7 +206,7 @@
         'is_public' => false,
         'members' => [
           {'group_id' => group_2.id,
-           'user' => {'id' => user_1.id, 'username' => user_1.username, 'uuid' => user_1.uuid }}
+           'user' => user_hash(user_1)}
         ], 'owners' => [], 'nestings' => [],
         'supertree_group_ids' => [group_2.id],
         'subtree_group_ids' => [group_2.id],
@@ -220,7 +220,7 @@
         'is_public' => true,
         'members' => [
           {'group_id' => group_3.id,
-           'user' => {'id' => user_2.id, 'username' => user_2.username, 'uuid' => user_2.uuid }}
+           'user' => user_hash(user_2)}
         ], 'owners' => [], 'nestings' => [],
         'supertree_group_ids' => [group_3.id],
         'subtree_group_ids' => [group_3.id],
@@ -282,7 +282,7 @@
         'is_public' => false,
         'members' => [
           {'group_id' => group_1.id,
-           'user' => {'id' => user_1.id, 'username' => user_1.username, 'uuid' => user_1.uuid }}
+           'user' => user_hash(user_1)}
         ],
         'owners' => [], 'nestings' => [],
         'supertree_group_ids' => [group_1.id],
@@ -308,7 +308,7 @@
         'is_public' => false,
         'members' => [], 'owners' => [
           {'group_id' => group_1.id,
-           'user' => {'id' => user_1.id, 'username' => user_1.username, 'uuid' => user_1.uuid }}
+           'user' => user_hash(user_1)}
         ], 'nestings' => [
           {
             'container_group_id' => group_1.id,
@@ -350,7 +350,7 @@
         'members' => [],
         'owners' => [
           {'group_id' => Group.last.id,
-           'user' => {'id' => user_1.id, 'username' => user_1.username, 'uuid' => user_1.uuid }}
+           'user' => user_hash(user_1)}
         ], 'nestings' => [],
         'supertree_group_ids' => [Group.last.id],
         'subtree_group_ids' => [Group.last.id],
@@ -473,4 +473,13 @@
     end
   end
 
+  def user_hash(user)
+    {
+      'id' => user.id,
+      'username' => user.username,
+      'uuid' => user.uuid,
+      'faculty_status' => user.faculty_status
+    }
+  end
+
 end
diff --git a/spec/controllers/api/v1/users_controller_spec.rb b/spec/controllers/api/v1/users_controller_spec.rb
@@ -59,7 +59,8 @@
             first_name: user_2.first_name,
             last_name: user_2.last_name,
             full_name: user_2.full_name,
-            uuid: user_2.uuid
+            uuid: user_2.uuid,
+            faculty_status: user_2.faculty_status
           }
         ]
       }.to_json
@@ -104,6 +105,7 @@
         id: user_1.id,
         username: user_1.username,
         uuid: user_1.uuid,
+        faculty_status: user_1.faculty_status,
         contact_infos: []
       }.to_json
 
@@ -122,6 +124,7 @@
         id: user_1.id,
         username: user_1.username,
         uuid: user_1.uuid,
+        faculty_status: user_1.faculty_status,
         contact_infos: []
       }.to_json
 
@@ -137,6 +140,7 @@
         first_name: user_2.first_name,
         last_name: user_2.last_name,
         full_name: user_2.full_name,
+        faculty_status: user_1.faculty_status,
         contact_infos: [be_kind_of(Hash), be_kind_of(Hash)]
       )
     end