From 46fd14a0a5ef6c104f3315d79ed4c95ae69d66c4 Mon Sep 17 00:00:00 2001
From: benji <benj_cous@hotmail.com>
Date: Thu, 19 Mar 2015 18:04:58 +0100
Subject: [PATCH] tests working

---
 app/views/users/_user.html.erb | 16 ++++------------
 app/views/users/index.html.erb |  7 +++++++
 app/views/users/show.html.erb  | 10 ++++++----
 db/seeds.rb                    |  2 +-
 test/fixtures/users.yml        |  4 ----
 test/models/user_test.rb       |  4 ----
 6 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index 8b1df6a..6586c01 100644
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -1,16 +1,8 @@
 <tr>
-  <td>
-    <%= user.id %>
-  </td>
-  <td>
-    <%= image_tag user.avatar(:small) %>
-  </td>
-  <td>
-    <%= user.nickname %>
-  </td>
-  <td>
-    <%= euro(user.debt) %>
-  </td>
+  <td><%= user.id %></td>
+  <td><%= image_tag user.avatar(:small) %></td>
+  <td><%= user.nickname %></td>
+  <td><%= euro(user.debt) %></td>
   <% if current_user.admin? %>
     <td>
       <%= link_to "Delete", user_path(user), method: :delete, class: "btn btn-danger", data: { confirm: "Are you sure?" } %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 65d17ed..3a05fa5 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -4,6 +4,13 @@
     <%= render partial: 'flash' %>
 
     <table id="users-table" class="table table-striped">
+      <tr>
+        <th>ID</th>
+        <th></th>
+        <th>Nickname</th>
+        <th>Debt</th>
+        <th></th>
+      </tr>
       <%= render @users %>
     </table>
   </div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 66bc886..c8862a7 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,10 +1,12 @@
 <%= render partial: 'flash' %>
 <div class="row">
   <div class="user_info">
-    <h5>
-      <%= link_to "[Edit dagschotel]" , user_edit_dagschotel_path(@user) if current_user == @user %>
-      <%= link_to "[Edit profile]" , edit_user_registration_path if current_user == @user %>
-  </h5>
+    <% if current_user == @user %>
+      <h5>
+        <%= link_to "[Edit dagschotel]" , user_edit_dagschotel_path(@user) %>
+        <%= link_to "[Edit profile]" , edit_user_registration_path %>
+      </h5>
+    <% end %>
     <h2><%= @user.nickname %></h2>
     <%= button_to "PLACE ORDER!", new_user_order_path(@user), method: :get if current_user == @user %>
     <div class="debt">DEBT: <%= euro(@user.debt) %></div>
diff --git a/db/seeds.rb b/db/seeds.rb
index 030d75a..a79bce8 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -75,7 +75,7 @@ end
 
 50.times do |i|
   User.create(
-    nickname: "TestUser#{i}",
+    nickname: "testUser#{i}",
     avatar: users[0][:avatar],
     password: DEFAULT_PASSWORD,
     password_confirmation: DEFAULT_PASSWORD
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 22defaa..d603a3d 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -30,14 +30,10 @@
 
 benji:
   nickname:      benji
-  name:          Benjamin
-  last_name:     Cousaert
   dagschotel_id: 1
 
 iasoon:
   nickname:  iasoon
-  name:      Ilion
-  last_name: Beyst
 
 admin:
   nickname:  admin
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 7a979c3..ac84d67 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -33,10 +33,6 @@ class UserTest < ActiveSupport::TestCase
     @user = users(:benji)
   end
 
-  test "full name" do
-    assert_equal @user.full_name, "Benjamin Cousaert"
-  end
-
   test "debt behaves correctly" do
     assert_equal @user.debt_cents, 0
     assert_equal @user.debt, 0