From 088d59d52548c14b9cc8a8790f7faae6087495c8 Mon Sep 17 00:00:00 2001
From: Varun Mathuria <v.mathuria@berkeley.edu>
Date: Thu, 27 Oct 2016 12:56:22 -0700
Subject: [PATCH] Varun iter2 cucumber (#17)

* Added submit_team.feature

* Made features pending

* Fixed mistakes
---
 coverage/.last_run.json      |   2 +-
 coverage/.resultset.json     |  74 ++--
 coverage/index.html          | 674 +++++++++++++++++++----------------
 features/edit_user.feature   |  28 ++
 features/submit_team.feature |  34 ++
 5 files changed, 463 insertions(+), 349 deletions(-)
 create mode 100644 features/edit_user.feature
 create mode 100644 features/submit_team.feature

diff --git a/coverage/.last_run.json b/coverage/.last_run.json
index 6c55dae2..5afadea5 100644
--- a/coverage/.last_run.json
+++ b/coverage/.last_run.json
@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 93.0
+    "covered_percent": 78.63
   }
 }
diff --git a/coverage/.resultset.json b/coverage/.resultset.json
index 75740ab6..465212bb 100644
--- a/coverage/.resultset.json
+++ b/coverage/.resultset.json
@@ -1,43 +1,36 @@
 {
   "Cucumber Features": {
     "coverage": {
-      "/home/ubuntu/workspace/enrollme/app/models/user.rb": [
+      "/home/ubuntu/workspace/enrollme/app/models/team.rb": [
         1,
         1,
         null,
-        1,
-        1,
-        1,
         null,
         1,
+        null,
         1,
         1,
-        null,
-        null,
-        null,
-        null,
         1,
-        2,
-        2,
-        2,
-        null,
-        null,
-        null,
-        null,
         null,
         null
       ],
-      "/home/ubuntu/workspace/enrollme/app/models/team.rb": [
+      "/home/ubuntu/workspace/enrollme/app/models/user.rb": [
         1,
         1,
         null,
-        null,
         1,
-        null,
+        1,
+        1,
         1,
         1,
         1,
         null,
+        1,
+        2,
+        2,
+        2,
+        null,
+        null,
         null
       ],
       "/home/ubuntu/workspace/enrollme/app/controllers/session_controller.rb": [
@@ -46,6 +39,8 @@
         1,
         29,
         2,
+        27,
+        0,
         null,
         27,
         null,
@@ -112,14 +107,11 @@
         1,
         null,
         1,
+        null,
         18,
         18,
         null,
-        null,
-        null,
-        null,
         18,
-        null,
         18,
         null,
         12,
@@ -189,11 +181,10 @@
         null,
         1,
         1,
-        null,
         1,
         null,
-        null,
         1,
+        null,
         1,
         1,
         1,
@@ -202,25 +193,13 @@
         1,
         null,
         1,
-        null,
         1,
         null,
         1,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        1,
         1,
         1,
         1,
-        1,
-        null,
         null,
         null,
         null,
@@ -238,9 +217,30 @@
         null,
         null,
         null
+      ],
+      "/home/ubuntu/workspace/enrollme/app/controllers/admin_controller.rb": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0
+      ],
+      "/home/ubuntu/workspace/enrollme/app/models/admin.rb": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0
       ]
     },
-    "timestamp": 1477332791
+    "timestamp": 1477527212
   },
   "RSpec": {
     "coverage": {
diff --git a/coverage/index.html b/coverage/index.html
index 16c7accf..63bd94d9 100644
--- a/coverage/index.html
+++ b/coverage/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <script src='./assets/0.10.0/application.js' type='text/javascript'></script>    
     <link href='./assets/0.10.0/application.css' media='screen, projection, print' rel='stylesheet' type='text/css'>
-    <link rel="shortcut icon" type="image/png" href="./assets/0.10.0/favicon_green.png" />
+    <link rel="shortcut icon" type="image/png" href="./assets/0.10.0/favicon_red.png" />
     <link rel="icon" type="image/png" href="./assets/0.10.0/favicon.png" />
   </head>
   
@@ -14,27 +14,27 @@
       <img src="./assets/0.10.0/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2016-10-24T18:13:11+00:00">2016-10-24T18:13:11+00:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2016-10-27T00:13:32+00:00">2016-10-27T00:13:32+00:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">
         <div class="file_list_container" id="AllFiles">
   <h2>
     <span class="group_name">All Files</span>
-    (<span class="covered_percent"><span class="green">93.0%</span></span>
+    (<span class="covered_percent"><span class="red">78.63%</span></span>
      covered at
      <span class="covered_strength">
        <span class="green">
-         4.48
+         4.04
        </span>
     </span> hits/line)
   </h2>
   <a name="AllFiles"></a>
   <div>
-    <b>11</b> files in total.
-    <b>100</b> relevant lines. 
-    <span class="green"><b>93</b> lines covered</span> and
-    <span class="red"><b>7</b> lines missed </span>
+    <b>13</b> files in total.
+    <b>117</b> relevant lines. 
+    <span class="green"><b>92</b> lines covered</span> and
+    <span class="red"><b>25</b> lines missed </span>
   </div>
   <table class="file_list">
     <thead>
@@ -50,6 +50,16 @@ <h2>
     </thead>
     <tbody>
       
+      <tr>
+        <td class="strong"><a href="#cb176cd376f57b82317c82478bb7c1a37365ae71" class="src_link" title="app/controllers/admin_controller.rb">app/controllers/admin_controller.rb</a></td>
+        <td class="red strong">0.0 %</td>
+        <td>9</td>
+        <td>9</td>
+        <td>0</td>
+        <td>9</td>
+        <td>0.0</td>
+      </tr>
+      
       <tr>
         <td class="strong"><a href="#9c7d88b8f7fd89bd29679db6c94f44c02e6a07ae" class="src_link" title="app/controllers/application_controller.rb">app/controllers/application_controller.rb</a></td>
         <td class="green strong">100.0 %</td>
@@ -62,18 +72,18 @@ <h2>
       
       <tr>
         <td class="strong"><a href="#0c81398497bff6181a0a0d97a681cddef3a7988b" class="src_link" title="app/controllers/session_controller.rb">app/controllers/session_controller.rb</a></td>
-        <td class="green strong">100.0 %</td>
-        <td>26</td>
-        <td>14</td>
-        <td>14</td>
-        <td>0</td>
-        <td>9.0</td>
+        <td class="green strong">93.75 %</td>
+        <td>28</td>
+        <td>16</td>
+        <td>15</td>
+        <td>1</td>
+        <td>9.6</td>
       </tr>
       
       <tr>
         <td class="strong"><a href="#67d1eece2541ce9ee85f6bd19ba118f959ad2bb7" class="src_link" title="app/controllers/team_controller.rb">app/controllers/team_controller.rb</a></td>
         <td class="green strong">100.0 %</td>
-        <td>45</td>
+        <td>42</td>
         <td>20</td>
         <td>20</td>
         <td>0</td>
@@ -82,10 +92,10 @@ <h2>
       
       <tr>
         <td class="strong"><a href="#b195cfcf26074564fdef14fa9bd173f43ec1fa81" class="src_link" title="app/controllers/users_controller.rb">app/controllers/users_controller.rb</a></td>
-        <td class="yellow strong">82.93 %</td>
-        <td>82</td>
-        <td>41</td>
-        <td>34</td>
+        <td class="yellow strong">82.05 %</td>
+        <td>69</td>
+        <td>39</td>
+        <td>32</td>
         <td>7</td>
         <td>1.3</td>
       </tr>
@@ -140,6 +150,16 @@ <h2>
         <td>1.0</td>
       </tr>
       
+      <tr>
+        <td class="strong"><a href="#0549c15be40cb687103954d21ea4eba65680407d" class="src_link" title="app/models/admin.rb">app/models/admin.rb</a></td>
+        <td class="red strong">0.0 %</td>
+        <td>8</td>
+        <td>8</td>
+        <td>0</td>
+        <td>8</td>
+        <td>0.0</td>
+      </tr>
+      
       <tr>
         <td class="strong"><a href="#eb6831f01a17495a1077aa1d9bd1c6e3942e21c9" class="src_link" title="app/models/team.rb">app/models/team.rb</a></td>
         <td class="green strong">100.0 %</td>
@@ -153,7 +173,7 @@ <h2>
       <tr>
         <td class="strong"><a href="#78179d3bd23c2cbe96cfc09fd242a6a5ef89923b" class="src_link" title="app/models/user.rb">app/models/user.rb</a></td>
         <td class="green strong">100.0 %</td>
-        <td>24</td>
+        <td>17</td>
         <td>12</td>
         <td>12</td>
         <td>0</td>
@@ -169,20 +189,20 @@ <h2>
           <div class="file_list_container" id="Controllers">
   <h2>
     <span class="group_name">Controllers</span>
-    (<span class="covered_percent"><span class="green">90.91%</span></span>
+    (<span class="covered_percent"><span class="yellow">80.23%</span></span>
      covered at
      <span class="covered_strength">
        <span class="green">
-         5.47
+         5.19
        </span>
     </span> hits/line)
   </h2>
   <a name="Controllers"></a>
   <div>
-    <b>4</b> files in total.
-    <b>77</b> relevant lines. 
-    <span class="green"><b>70</b> lines covered</span> and
-    <span class="red"><b>7</b> lines missed </span>
+    <b>5</b> files in total.
+    <b>86</b> relevant lines. 
+    <span class="green"><b>69</b> lines covered</span> and
+    <span class="red"><b>17</b> lines missed </span>
   </div>
   <table class="file_list">
     <thead>
@@ -198,6 +218,16 @@ <h2>
     </thead>
     <tbody>
       
+      <tr>
+        <td class="strong"><a href="#cb176cd376f57b82317c82478bb7c1a37365ae71" class="src_link" title="app/controllers/admin_controller.rb">app/controllers/admin_controller.rb</a></td>
+        <td class="red strong">0.0 %</td>
+        <td>9</td>
+        <td>9</td>
+        <td>0</td>
+        <td>9</td>
+        <td>0.0</td>
+      </tr>
+      
       <tr>
         <td class="strong"><a href="#9c7d88b8f7fd89bd29679db6c94f44c02e6a07ae" class="src_link" title="app/controllers/application_controller.rb">app/controllers/application_controller.rb</a></td>
         <td class="green strong">100.0 %</td>
@@ -210,18 +240,18 @@ <h2>
       
       <tr>
         <td class="strong"><a href="#0c81398497bff6181a0a0d97a681cddef3a7988b" class="src_link" title="app/controllers/session_controller.rb">app/controllers/session_controller.rb</a></td>
-        <td class="green strong">100.0 %</td>
-        <td>26</td>
-        <td>14</td>
-        <td>14</td>
-        <td>0</td>
-        <td>9.0</td>
+        <td class="green strong">93.75 %</td>
+        <td>28</td>
+        <td>16</td>
+        <td>15</td>
+        <td>1</td>
+        <td>9.6</td>
       </tr>
       
       <tr>
         <td class="strong"><a href="#67d1eece2541ce9ee85f6bd19ba118f959ad2bb7" class="src_link" title="app/controllers/team_controller.rb">app/controllers/team_controller.rb</a></td>
         <td class="green strong">100.0 %</td>
-        <td>45</td>
+        <td>42</td>
         <td>20</td>
         <td>20</td>
         <td>0</td>
@@ -230,10 +260,10 @@ <h2>
       
       <tr>
         <td class="strong"><a href="#b195cfcf26074564fdef14fa9bd173f43ec1fa81" class="src_link" title="app/controllers/users_controller.rb">app/controllers/users_controller.rb</a></td>
-        <td class="yellow strong">82.93 %</td>
-        <td>82</td>
-        <td>41</td>
-        <td>34</td>
+        <td class="yellow strong">82.05 %</td>
+        <td>69</td>
+        <td>39</td>
+        <td>32</td>
         <td>7</td>
         <td>1.3</td>
       </tr>
@@ -246,20 +276,20 @@ <h2>
           <div class="file_list_container" id="Models">
   <h2>
     <span class="group_name">Models</span>
-    (<span class="covered_percent"><span class="green">100.0%</span></span>
+    (<span class="covered_percent"><span class="red">69.23%</span></span>
      covered at
      <span class="covered_strength">
-       <span class="green">
-         1.2
+       <span class="red">
+         0.83
        </span>
     </span> hits/line)
   </h2>
   <a name="Models"></a>
   <div>
-    <b>2</b> files in total.
-    <b>18</b> relevant lines. 
+    <b>3</b> files in total.
+    <b>26</b> relevant lines. 
     <span class="green"><b>18</b> lines covered</span> and
-    <span class="red"><b>0</b> lines missed </span>
+    <span class="red"><b>8</b> lines missed </span>
   </div>
   <table class="file_list">
     <thead>
@@ -275,6 +305,16 @@ <h2>
     </thead>
     <tbody>
       
+      <tr>
+        <td class="strong"><a href="#0549c15be40cb687103954d21ea4eba65680407d" class="src_link" title="app/models/admin.rb">app/models/admin.rb</a></td>
+        <td class="red strong">0.0 %</td>
+        <td>8</td>
+        <td>8</td>
+        <td>0</td>
+        <td>8</td>
+        <td>0.0</td>
+      </tr>
+      
       <tr>
         <td class="strong"><a href="#eb6831f01a17495a1077aa1d9bd1c6e3942e21c9" class="src_link" title="app/models/team.rb">app/models/team.rb</a></td>
         <td class="green strong">100.0 %</td>
@@ -288,7 +328,7 @@ <h2>
       <tr>
         <td class="strong"><a href="#78179d3bd23c2cbe96cfc09fd242a6a5ef89923b" class="src_link" title="app/models/user.rb">app/models/user.rb</a></td>
         <td class="green strong">100.0 %</td>
-        <td>24</td>
+        <td>17</td>
         <td>12</td>
         <td>12</td>
         <td>0</td>
@@ -508,6 +548,78 @@ <h2>
     
       <div class="source_files">
       
+        <div class="source_table" id="cb176cd376f57b82317c82478bb7c1a37365ae71">
+  <div class="header">
+    <h3>app/controllers/admin_controller.rb</h3>
+    <h4><span class="red">0.0 %</span> covered</h4>
+    <div>
+      <b>9</b> relevant lines. 
+      <span class="green"><b>0</b> lines covered</span> and
+      <span class="red"><b>9</b> lines missed.</span>
+    </div>
+  </div>
+  
+  <pre>
+    <ol>
+      
+        <li class="missed" data-hits="0" data-linenumber="1">
+          
+          
+          <code class="ruby">class AdminController &lt; ApplicationController</code>
+        </li>
+      
+        <li class="missed" data-hits="0" data-linenumber="2">
+          
+          
+          <code class="ruby">  </code>
+        </li>
+      
+        <li class="missed" data-hits="0" data-linenumber="3">
+          
+          
+          <code class="ruby">  def index</code>
+        </li>
+      
+        <li class="missed" data-hits="0" data-linenumber="4">
+          
+          
+          <code class="ruby">    # TODO: clean up routes</code>
+        </li>
+      
+        <li class="missed" data-hits="0" data-linenumber="5">
+          
+          
+          <code class="ruby">    </code>
+        </li>
+      
+        <li class="missed" data-hits="0" data-linenumber="6">
+          
+          
+          <code class="ruby">  end</code>
+        </li>
+      
+        <li class="missed" data-hits="0" data-linenumber="7">
+          
+          
+          <code class="ruby">  </code>
+        </li>
+      
+        <li class="missed" data-hits="0" data-linenumber="8">
+          
+          
+          <code class="ruby">  </code>
+        </li>
+      
+        <li class="missed" data-hits="0" data-linenumber="9">
+          
+          
+          <code class="ruby">end</code>
+        </li>
+      
+    </ol>
+  </pre>
+</div>
+      
         <div class="source_table" id="9c7d88b8f7fd89bd29679db6c94f44c02e6a07ae">
   <div class="header">
     <h3>app/controllers/application_controller.rb</h3>
@@ -637,11 +749,11 @@ <h4><span class="green">100.0 %</span> covered</h4>
         <div class="source_table" id="0c81398497bff6181a0a0d97a681cddef3a7988b">
   <div class="header">
     <h3>app/controllers/session_controller.rb</h3>
-    <h4><span class="green">100.0 %</span> covered</h4>
+    <h4><span class="green">93.75 %</span> covered</h4>
     <div>
-      <b>14</b> relevant lines. 
-      <span class="green"><b>14</b> lines covered</span> and
-      <span class="red"><b>0</b> lines missed.</span>
+      <b>16</b> relevant lines. 
+      <span class="green"><b>15</b> lines covered</span> and
+      <span class="red"><b>1</b> lines missed.</span>
     </div>
   </div>
   
@@ -678,127 +790,139 @@ <h4><span class="green">100.0 %</span> covered</h4>
           <code class="ruby">      return redirect_to team_index_path</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="6">
+        <li class="covered" data-hits="27" data-linenumber="6">
+          <span class="hits">27</span>
+          
+          <code class="ruby">    elsif session[:is_admin]</code>
+        </li>
+      
+        <li class="missed" data-hits="0" data-linenumber="7">
+          
+          
+          <code class="ruby">      return redirect_to admin_path</code>
+        </li>
+      
+        <li class="never" data-hits="" data-linenumber="8">
           
           
           <code class="ruby">    else</code>
         </li>
       
-        <li class="covered" data-hits="27" data-linenumber="7">
+        <li class="covered" data-hits="27" data-linenumber="9">
           <span class="hits">27</span>
           
           <code class="ruby">      render &#39;new&#39;</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="8">
+        <li class="never" data-hits="" data-linenumber="10">
           
           
           <code class="ruby">    end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="9">
+        <li class="never" data-hits="" data-linenumber="11">
           
           
           <code class="ruby">  end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="10">
+        <li class="never" data-hits="" data-linenumber="12">
           
           
           <code class="ruby">  </code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="11">
+        <li class="covered" data-hits="1" data-linenumber="13">
           <span class="hits">1</span>
           
           <code class="ruby">  def create</code>
         </li>
       
-        <li class="covered" data-hits="16" data-linenumber="12">
+        <li class="covered" data-hits="16" data-linenumber="14">
           <span class="hits">16</span>
           
           <code class="ruby">    @user = User.where(:email =&gt; params[:email]).first</code>
         </li>
       
-        <li class="covered" data-hits="16" data-linenumber="13">
+        <li class="covered" data-hits="16" data-linenumber="15">
           <span class="hits">16</span>
           
           <code class="ruby">    if @user.nil? or @user.password != params[:password]</code>
         </li>
       
-        <li class="covered" data-hits="2" data-linenumber="14">
+        <li class="covered" data-hits="2" data-linenumber="16">
           <span class="hits">2</span>
           
           <code class="ruby">        return redirect_to login_path, notice: &quot;Invalid email or password&quot;</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="15">
+        <li class="never" data-hits="" data-linenumber="17">
           
           
           <code class="ruby">    end</code>
         </li>
       
-        <li class="covered" data-hits="14" data-linenumber="16">
+        <li class="covered" data-hits="14" data-linenumber="18">
           <span class="hits">14</span>
           
           <code class="ruby">    session[:user_id] = @user.id</code>
         </li>
       
-        <li class="covered" data-hits="14" data-linenumber="17">
+        <li class="covered" data-hits="14" data-linenumber="19">
           <span class="hits">14</span>
           
           <code class="ruby">    redirect_to team_index_path, notice: &quot;Logged in!&quot;</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="18">
+        <li class="never" data-hits="" data-linenumber="20">
           
           
           <code class="ruby">  end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="19">
+        <li class="never" data-hits="" data-linenumber="21">
           
           
           <code class="ruby">  </code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="20">
+        <li class="covered" data-hits="1" data-linenumber="22">
           <span class="hits">1</span>
           
           <code class="ruby">  def destroy</code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="21">
+        <li class="covered" data-hits="1" data-linenumber="23">
           <span class="hits">1</span>
           
           <code class="ruby">    session[:user_id] = nil</code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="22">
+        <li class="covered" data-hits="1" data-linenumber="24">
           <span class="hits">1</span>
           
           <code class="ruby">    redirect_to root_url, notice: &quot;Logged out!&quot;</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="23">
+        <li class="never" data-hits="" data-linenumber="25">
           
           
           <code class="ruby">  end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="24">
+        <li class="never" data-hits="" data-linenumber="26">
           
           
           <code class="ruby">  </code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="25">
+        <li class="never" data-hits="" data-linenumber="27">
           
           
           <code class="ruby">  </code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="26">
+        <li class="never" data-hits="" data-linenumber="28">
           
           
           <code class="ruby">end</code>
@@ -840,253 +964,235 @@ <h4><span class="green">100.0 %</span> covered</h4>
           <code class="ruby">  def index</code>
         </li>
       
-        <li class="covered" data-hits="18" data-linenumber="4">
-          <span class="hits">18</span>
+        <li class="never" data-hits="" data-linenumber="4">
           
-          <code class="ruby">    @user_id = session[:user_id]</code>
+          
+          <code class="ruby">    # TODO: can refactor index and show, also join/leave team in user controller</code>
         </li>
       
         <li class="covered" data-hits="18" data-linenumber="5">
           <span class="hits">18</span>
           
-          <code class="ruby">    return redirect_to login_path if @user_id.nil?</code>
+          <code class="ruby">    @user_id = session[:user_id]</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="6">
-          
+        <li class="covered" data-hits="18" data-linenumber="6">
+          <span class="hits">18</span>
           
-          <code class="ruby">    </code>
+          <code class="ruby">    return redirect_to login_path if @user_id.nil?</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="7">
           
           
-          <code class="ruby">    # @user = User.find_by_id(@user_id)</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="8">
-          
-          
-          <code class="ruby">    # return redirect_to login_path if @user.nil?</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="9">
-          
-          
           <code class="ruby">    </code>
         </li>
       
-        <li class="covered" data-hits="18" data-linenumber="10">
+        <li class="covered" data-hits="18" data-linenumber="8">
           <span class="hits">18</span>
           
           <code class="ruby">    @user = User.find(@user_id)</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="11">
-          
-          
-          <code class="ruby">    </code>
-        </li>
-      
-        <li class="covered" data-hits="18" data-linenumber="12">
+        <li class="covered" data-hits="18" data-linenumber="9">
           <span class="hits">18</span>
           
           <code class="ruby">    return redirect_to without_team_path, :notice =&gt; &quot;Your team does not exist&quot; if @user.team.nil?</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="13">
+        <li class="never" data-hits="" data-linenumber="10">
           
           
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="12" data-linenumber="14">
+        <li class="covered" data-hits="12" data-linenumber="11">
           <span class="hits">12</span>
           
           <code class="ruby">    return redirect_to team_path(:id =&gt; @user.team.id)</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="15">
+        <li class="never" data-hits="" data-linenumber="12">
           
           
           <code class="ruby">  end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="16">
+        <li class="never" data-hits="" data-linenumber="13">
           
           
           <code class="ruby">  </code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="17">
+        <li class="covered" data-hits="1" data-linenumber="14">
           <span class="hits">1</span>
           
           <code class="ruby">  def show</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="18">
+        <li class="covered" data-hits="20" data-linenumber="15">
           <span class="hits">20</span>
           
           <code class="ruby">    @team = Team.where(:id =&gt; params[:id]).first</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="19">
+        <li class="covered" data-hits="20" data-linenumber="16">
           <span class="hits">20</span>
           
           <code class="ruby">    return redirect_to &#39;/&#39;, notice: &quot;This team does not exist&quot; if @team.nil?</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="20">
+        <li class="never" data-hits="" data-linenumber="17">
           
           
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="19" data-linenumber="21">
+        <li class="covered" data-hits="19" data-linenumber="18">
           <span class="hits">19</span>
           
           <code class="ruby">    @user_id = session[:user_id]</code>
         </li>
       
-        <li class="covered" data-hits="19" data-linenumber="22">
+        <li class="covered" data-hits="19" data-linenumber="19">
           <span class="hits">19</span>
           
           <code class="ruby">    return redirect_to login_path if @user_id.nil?</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="23">
+        <li class="never" data-hits="" data-linenumber="20">
           
           
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="18" data-linenumber="24">
+        <li class="covered" data-hits="18" data-linenumber="21">
           <span class="hits">18</span>
           
           <code class="ruby">    @user = User.find(@user_id)</code>
         </li>
       
-        <li class="covered" data-hits="18" data-linenumber="25">
+        <li class="covered" data-hits="18" data-linenumber="22">
           <span class="hits">18</span>
           
           <code class="ruby">    return redirect_to without_team_path, :notice =&gt; &quot;Your team does not exist&quot; if @user.team.nil?</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="26">
+        <li class="never" data-hits="" data-linenumber="23">
           
           
           <code class="ruby">  </code>
         </li>
       
-        <li class="covered" data-hits="17" data-linenumber="27">
+        <li class="covered" data-hits="17" data-linenumber="24">
           <span class="hits">17</span>
           
           <code class="ruby">    return redirect_to team_path(:id =&gt; @user.team.id), notice: &quot;Cannot access this team&quot; if @user.team != @team</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="28">
+        <li class="never" data-hits="" data-linenumber="25">
           
           
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="16" data-linenumber="29">
+        <li class="covered" data-hits="16" data-linenumber="26">
           <span class="hits">16</span>
           
           <code class="ruby">    render &quot;team&quot;</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="30">
+        <li class="never" data-hits="" data-linenumber="27">
           
           
           <code class="ruby">  end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="31">
+        <li class="never" data-hits="" data-linenumber="28">
           
           
           <code class="ruby">  </code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="32">
+        <li class="covered" data-hits="1" data-linenumber="29">
           <span class="hits">1</span>
           
           <code class="ruby">  def leave</code>
         </li>
       
-        <li class="covered" data-hits="2" data-linenumber="33">
+        <li class="covered" data-hits="2" data-linenumber="30">
           <span class="hits">2</span>
           
           <code class="ruby">    User.find(session[:user_id]).leave_team</code>
         </li>
       
-        <li class="covered" data-hits="2" data-linenumber="34">
+        <li class="covered" data-hits="2" data-linenumber="31">
           <span class="hits">2</span>
           
           <code class="ruby">    return redirect_to without_team_path</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="35">
+        <li class="never" data-hits="" data-linenumber="32">
           
           
           <code class="ruby">  end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="36">
+        <li class="never" data-hits="" data-linenumber="33">
           
           
           <code class="ruby">  </code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="37">
+        <li class="covered" data-hits="1" data-linenumber="34">
           <span class="hits">1</span>
           
           <code class="ruby">  def update</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="38">
+        <li class="never" data-hits="" data-linenumber="35">
           
           
           <code class="ruby">  end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="39">
+        <li class="never" data-hits="" data-linenumber="36">
           
           
           <code class="ruby">  </code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="40">
+        <li class="never" data-hits="" data-linenumber="37">
           
           
           <code class="ruby">  # TODO: edit users in the team page (for now, it&#39;s just text)</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="41">
+        <li class="never" data-hits="" data-linenumber="38">
           
           
           <code class="ruby">  # but we need to change that to a button + add some kind of form?</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="42">
+        <li class="never" data-hits="" data-linenumber="39">
           
           
           <code class="ruby">  # what were we going to do with that anyway, add/delete?</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="43">
+        <li class="never" data-hits="" data-linenumber="40">
           
           
           <code class="ruby">  # we could just have a &quot;remove&quot; button and some kind of </code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="44">
+        <li class="never" data-hits="" data-linenumber="41">
           
           
           <code class="ruby">  # &quot;Are you sure?&quot; thing--can ask MDS what he wants idk</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="45">
+        <li class="never" data-hits="" data-linenumber="42">
           
           
           <code class="ruby">end</code>
@@ -1099,10 +1205,10 @@ <h4><span class="green">100.0 %</span> covered</h4>
         <div class="source_table" id="b195cfcf26074564fdef14fa9bd173f43ec1fa81">
   <div class="header">
     <h3>app/controllers/users_controller.rb</h3>
-    <h4><span class="yellow">82.93 %</span> covered</h4>
+    <h4><span class="yellow">82.05 %</span> covered</h4>
     <div>
-      <b>41</b> relevant lines. 
-      <span class="green"><b>34</b> lines covered</span> and
+      <b>39</b> relevant lines. 
+      <span class="green"><b>32</b> lines covered</span> and
       <span class="red"><b>7</b> lines missed.</span>
     </div>
   </div>
@@ -1308,295 +1414,217 @@ <h4><span class="yellow">82.93 %</span> covered</h4>
           <code class="ruby">    @user = User.find(session[:user_id])</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="34">
-          
-          
-          <code class="ruby">    </code>
-        </li>
-      
-        <li class="covered" data-hits="1" data-linenumber="35">
+        <li class="covered" data-hits="1" data-linenumber="34">
           <span class="hits">1</span>
           
           <code class="ruby">    @user.leave_team if !(@user.team.nil?)</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="36">
+        <li class="never" data-hits="" data-linenumber="35">
           
           
           <code class="ruby">    </code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="37">
-          
+        <li class="covered" data-hits="1" data-linenumber="36">
+          <span class="hits">1</span>
           
-          <code class="ruby">    </code>
+          <code class="ruby">    @team = Team.create!(:passcode =&gt; Team.generate_hash, :approved =&gt; false)</code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="38">
-          <span class="hits">1</span>
+        <li class="never" data-hits="" data-linenumber="37">
           
-          <code class="ruby">    @team = Team.create!(:passcode =&gt; Team.generate_hash, :approved =&gt; false)</code>
+          
+          <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="39">
+        <li class="covered" data-hits="1" data-linenumber="38">
           <span class="hits">1</span>
           
           <code class="ruby">    @user.team = @team</code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="40">
+        <li class="covered" data-hits="1" data-linenumber="39">
           <span class="hits">1</span>
           
           <code class="ruby">    @team.users &lt;&lt; @user</code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="41">
+        <li class="covered" data-hits="1" data-linenumber="40">
           <span class="hits">1</span>
           
-          <code class="ruby">    redirect_to team_path(:id=&gt;@team.id), :notice =&gt; &quot;Successfully created a team!&quot;</code>
+          <code class="ruby">    redirect_to team_path(:id=&gt;@team.id)</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="42">
+        <li class="never" data-hits="" data-linenumber="41">
           
           
           <code class="ruby">  end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="43">
+        <li class="never" data-hits="" data-linenumber="42">
           
           
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="44">
+        <li class="covered" data-hits="1" data-linenumber="43">
           <span class="hits">1</span>
           
           <code class="ruby">  def join_team</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="45">
+        <li class="never" data-hits="" data-linenumber="44">
           
           
           <code class="ruby">    # TODO: How to make all other views use application view for header?</code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="46">
+        <li class="covered" data-hits="1" data-linenumber="45">
           <span class="hits">1</span>
           
           <code class="ruby">    @user = User.find(session[:user_id])</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="47">
-          
-          
-          <code class="ruby"></code>
-        </li>
-      
-        <li class="covered" data-hits="1" data-linenumber="48">
+        <li class="covered" data-hits="1" data-linenumber="46">
           <span class="hits">1</span>
           
           <code class="ruby">    @user.leave_team if !(@user.team.nil?)</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="49">
+        <li class="never" data-hits="" data-linenumber="47">
           
           
           <code class="ruby">    </code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="50">
+        <li class="covered" data-hits="1" data-linenumber="48">
           <span class="hits">1</span>
           
-          <code class="ruby">    @team_passcode = params[:team_hash]</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="51">
-          
-          
-          <code class="ruby">    #if @team_passcode.empty? or !(Team.exists?(:passcode =&gt; @team_passcode))</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="52">
-          
-          
-          <code class="ruby">    #  redirect_to without_team_path, :notice =&gt; &quot;Please enter a valid team passcode&quot;</code>
+          <code class="ruby">    @team = Team.find_by_passcode(params[:team_hash])</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="53">
-          
-          
-          <code class="ruby">    #else</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="54">
-          
-          
-          <code class="ruby">      # TODO: when editing info, pre-fill in boxes</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="55">
-          
-          
-          <code class="ruby">      # also when we integrate calnet, email/password box shouldn&#39;t be there</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="56">
-          
-          
-          <code class="ruby">      # actually the user shouldn&#39;t be able to edit their info at all...</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="57">
-          
-          
-          <code class="ruby">      # should be given by their calnet info</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="58">
-          
-          
-          <code class="ruby">      # but while we have this, this page&#39;s button should be &quot;Save changes&quot;, not &quot;Create User&quot;</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="59">
-          
-          
-          <code class="ruby">      # probably best idea to get rid of this page completely</code>
-        </li>
-      
-        <li class="covered" data-hits="1" data-linenumber="60">
-          <span class="hits">1</span>
+        <li class="never" data-hits="" data-linenumber="49">
           
-          <code class="ruby">      @user = User.find(session[:user_id])</code>
-        </li>
-      
-        <li class="covered" data-hits="1" data-linenumber="61">
-          <span class="hits">1</span>
           
-          <code class="ruby">      @team = Team.find_by_passcode(@team_passcode)</code>
+          <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="62">
+        <li class="covered" data-hits="1" data-linenumber="50">
           <span class="hits">1</span>
           
-          <code class="ruby">      @user.team = @team</code>
+          <code class="ruby">    @user.team = @team</code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="63">
+        <li class="covered" data-hits="1" data-linenumber="51">
           <span class="hits">1</span>
           
-          <code class="ruby">      @team.users &lt;&lt; @user</code>
+          <code class="ruby">    @team.users &lt;&lt; @user</code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="64">
+        <li class="covered" data-hits="1" data-linenumber="52">
           <span class="hits">1</span>
           
-          <code class="ruby">      redirect_to team_path(:id=&gt;@team.id)</code>
+          <code class="ruby">    redirect_to team_path(:id=&gt;@team.id)</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="65">
-          
-          
-          <code class="ruby">    #end</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="66">
+        <li class="never" data-hits="" data-linenumber="53">
           
           
           <code class="ruby">    </code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="67">
+        <li class="never" data-hits="" data-linenumber="54">
           
           
           <code class="ruby">  end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="68">
+        <li class="never" data-hits="" data-linenumber="55">
           
           
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="69">
+        <li class="covered" data-hits="1" data-linenumber="56">
           <span class="hits">1</span>
           
           <code class="ruby">  def update</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="70">
+        <li class="missed" data-hits="0" data-linenumber="57">
           
           
           <code class="ruby">    @user = User.find session[:user_id]</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="71">
+        <li class="missed" data-hits="0" data-linenumber="58">
           
           
           <code class="ruby">    @user.update_attributes!(user_params)</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="72">
+        <li class="missed" data-hits="0" data-linenumber="59">
           
           
           <code class="ruby">    @team = @user != nil ? @user.team : nil</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="73">
+        <li class="missed" data-hits="0" data-linenumber="60">
           
           
           <code class="ruby">    return redirect_to team_path({:id =&gt; @team === nil ? 1 : @team.id, :uid =&gt; @user.id})</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="74">
+        <li class="never" data-hits="" data-linenumber="61">
           
           
           <code class="ruby">  end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="75">
+        <li class="never" data-hits="" data-linenumber="62">
           
           
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="76">
+        <li class="covered" data-hits="1" data-linenumber="63">
           <span class="hits">1</span>
           
           <code class="ruby">  private</code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="77">
+        <li class="covered" data-hits="1" data-linenumber="64">
           <span class="hits">1</span>
           
           <code class="ruby">    def user_params</code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="78">
+        <li class="covered" data-hits="1" data-linenumber="65">
           <span class="hits">1</span>
           
           <code class="ruby">      params.require(:user).permit(:name, :email, :password, :team, :sid, :major)</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="79">
+        <li class="never" data-hits="" data-linenumber="66">
           
           
           <code class="ruby">    end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="80">
+        <li class="never" data-hits="" data-linenumber="67">
           
           
           <code class="ruby"></code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="81">
+        <li class="never" data-hits="" data-linenumber="68">
           
           
           <code class="ruby"></code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="82">
+        <li class="never" data-hits="" data-linenumber="69">
           
           
           <code class="ruby">end</code>
@@ -1756,6 +1784,72 @@ <h4><span class="green">100.0 %</span> covered</h4>
   </pre>
 </div>
       
+        <div class="source_table" id="0549c15be40cb687103954d21ea4eba65680407d">
+  <div class="header">
+    <h3>app/models/admin.rb</h3>
+    <h4><span class="red">0.0 %</span> covered</h4>
+    <div>
+      <b>8</b> relevant lines. 
+      <span class="green"><b>0</b> lines covered</span> and
+      <span class="red"><b>8</b> lines missed.</span>
+    </div>
+  </div>
+  
+  <pre>
+    <ol>
+      
+        <li class="missed" data-hits="0" data-linenumber="1">
+          
+          
+          <code class="ruby">class Admin &lt; ActiveRecord::Base</code>
+        </li>
+      
+        <li class="missed" data-hits="0" data-linenumber="2">
+          
+          
+          <code class="ruby">    </code>
+        </li>
+      
+        <li class="missed" data-hits="0" data-linenumber="3">
+          
+          
+          <code class="ruby">  validates :name, presence: true, length: { maximum: 50 }</code>
+        </li>
+      
+        <li class="missed" data-hits="0" data-linenumber="4">
+          
+          
+          <code class="ruby">  VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i</code>
+        </li>
+      
+        <li class="missed" data-hits="0" data-linenumber="5">
+          
+          
+          <code class="ruby">  validates :email, presence: true, uniqueness: true, length: { maximum: 50 }, format: VALID_EMAIL_REGEX</code>
+        </li>
+      
+        <li class="missed" data-hits="0" data-linenumber="6">
+          
+          
+          <code class="ruby">  validates :password, presence: true, length: { maximum: 50 }</code>
+        </li>
+      
+        <li class="missed" data-hits="0" data-linenumber="7">
+          
+          
+          <code class="ruby"></code>
+        </li>
+      
+        <li class="missed" data-hits="0" data-linenumber="8">
+          
+          
+          <code class="ruby">end</code>
+        </li>
+      
+    </ol>
+  </pre>
+</div>
+      
         <div class="source_table" id="eb6831f01a17495a1077aa1d9bd1c6e3942e21c9">
   <div class="header">
     <h3>app/models/team.rb</h3>
@@ -1890,109 +1984,67 @@ <h4><span class="green">100.0 %</span> covered</h4>
           <code class="ruby">  validates :email, presence: true, uniqueness: true, length: { maximum: 50 }, format: VALID_EMAIL_REGEX</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="7">
-          
-          
-          <code class="ruby">  # validates :team, presence: true, length: { maximum: 50 }</code>
-        </li>
-      
-        <li class="covered" data-hits="1" data-linenumber="8">
+        <li class="covered" data-hits="1" data-linenumber="7">
           <span class="hits">1</span>
           
           <code class="ruby">  validates :major, presence: true, length: { maximum: 50 }</code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="9">
+        <li class="covered" data-hits="1" data-linenumber="8">
           <span class="hits">1</span>
           
           <code class="ruby">  validates :sid, presence: true, uniqueness: true, length: { maximum: 10 }</code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="10">
+        <li class="covered" data-hits="1" data-linenumber="9">
           <span class="hits">1</span>
           
-          <code class="ruby">  validates :password, presence: true, length: {maximum: 50 }</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="11">
-          
-          
-          <code class="ruby">  </code>
+          <code class="ruby">  validates :password, presence: true, length: { maximum: 50 }</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="12">
-          
-          
-          <code class="ruby">  #has_secure_password</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="13">
-          
-          
-          <code class="ruby">  </code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="14">
+        <li class="never" data-hits="" data-linenumber="10">
           
           
           <code class="ruby">  </code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="15">
+        <li class="covered" data-hits="1" data-linenumber="11">
           <span class="hits">1</span>
           
           <code class="ruby">  def leave_team</code>
         </li>
       
-        <li class="covered" data-hits="2" data-linenumber="16">
+        <li class="covered" data-hits="2" data-linenumber="12">
           <span class="hits">2</span>
           
           <code class="ruby">    @team = self.team</code>
         </li>
       
-        <li class="covered" data-hits="2" data-linenumber="17">
+        <li class="covered" data-hits="2" data-linenumber="13">
           <span class="hits">2</span>
           
           <code class="ruby">    @team.users.delete(self)</code>
         </li>
       
-        <li class="covered" data-hits="2" data-linenumber="18">
+        <li class="covered" data-hits="2" data-linenumber="14">
           <span class="hits">2</span>
           
           <code class="ruby">    self.team = nil</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="19">
+        <li class="never" data-hits="" data-linenumber="15">
           
           
           <code class="ruby">  end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="20">
-          
-          
-          <code class="ruby">  </code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="21">
-          
-          
-          <code class="ruby">    </code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="22">
-          
-          
-          <code class="ruby">  </code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="23">
+        <li class="never" data-hits="" data-linenumber="16">
           
           
-          <code class="ruby">    </code>
+          <code class="ruby"></code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="24">
+        <li class="never" data-hits="" data-linenumber="17">
           
           
           <code class="ruby">end</code>
diff --git a/features/edit_user.feature b/features/edit_user.feature
new file mode 100644
index 00000000..898e0d07
--- /dev/null
+++ b/features/edit_user.feature
@@ -0,0 +1,28 @@
+Feature: edit user information
+
+  As a student
+  So that I can fix any mistakes I made in inputting information
+  I want to be able to edit my user information
+  
+  Background:
+    Given PENDING: the following users exist
+     |   name    |       email       |password |team_passcode | major        |       sid      |
+  	 | Jorge    |    legueoflegends667@hotmail.com  | password1 | 0 | Football Player | 999  |
+ 	   | Sahai     | eecs666@hotmail.com        | mypassword     | penguindrool | EECS            | 000  |
+ 	
+ 	And PENDING: I am on the login page
+ 	
+  Scenario: An existing user logs in, joins a team, and edits his information
+    Given PENDING: I fill in "Email" with "legueoflegends667@hotmail.com"
+    And PENDING: I fill in "Password" with "password1"
+    And PENDING: I press "Log In"
+    
+    And PENDING: I fill in "team_hash" with "penguindrool"
+    And PENDING: I press "Join"
+
+    Given PENDING: I follow "Edit My Info"
+    And PENDING: I fill in "Password" with "password2"
+    And PENDING: I press "Update Information"
+    And PENDING: I follow "Edit My Info"
+    Then PENDING: I should see "password2"
+    
\ No newline at end of file
diff --git a/features/submit_team.feature b/features/submit_team.feature
new file mode 100644
index 00000000..d55691d8
--- /dev/null
+++ b/features/submit_team.feature
@@ -0,0 +1,34 @@
+Feature: submit team
+  
+  As an student user
+  In order to enroll my team
+  I want to be able to submit my team for enrollment consideration
+  
+  Background: users have been added to database
+  	Given PENDING: the following users exist
+  		|   name    |       email                       | password              | team      | major             |       sid         |  
+  	    | Jorge     |    legueoflegends667@hotmail.com  | password1             | passcode1 | Football Player   | 999               |
+  	    | Bob1      |    bobjones1@berkeley.edu         | password1             | passcode1 | Slavic Studies    | 825               |
+  	    | Bob2      |    bobjones2@berkeley.edu         | password1             | passcode1 | Slavic Studies    | 826               |
+  	    | Bob3      |    bobjones3@berkeley.edu         | password1             | passcode1 | Slavic Studies    | 827               |
+  	    
+    Given PENDING: I am on the login page
+    
+  Scenario: Submit button should not be present when team has only four members
+    Given PENDING: I fill in "Email" with "leagueoflegends667@hotmail.com"
+    And PENDING: I fill in "Password" with "password1"
+    And PENDING: I press "Log In"
+    Then PENDING: I should not see "Submit"
+    
+  Scenario: Submit button should be present when team has five or more members, and warning should be displayed
+    Given PENDING: the following users exist
+        |   name    |       email                       | password              | team      | major             | sid         |
+        | Sahai     | eecs666@hotmail.com               | mypassword            | passcode1 | EECS              | 000         |
+    
+    And PENDING: I am on the login page
+    Given PENDING: I fill in "Email" with "eecs666@hotmail.com"
+    And PENDING: I fill in "Password" with "mypassword"
+    And PENDING: I press "Log In"
+    Then PENDING: I should see "Submit"
+    And PENDING: I should see "Warning:"
+    
\ No newline at end of file