tests working
This commit is contained in:
parent
a4245c1331
commit
46fd14a0a5
|
@ -1,16 +1,8 @@
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td><%= user.id %></td>
|
||||||
<%= user.id %>
|
<td><%= image_tag user.avatar(:small) %></td>
|
||||||
</td>
|
<td><%= user.nickname %></td>
|
||||||
<td>
|
<td><%= euro(user.debt) %></td>
|
||||||
<%= image_tag user.avatar(:small) %>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<%= user.nickname %>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<%= euro(user.debt) %>
|
|
||||||
</td>
|
|
||||||
<% if current_user.admin? %>
|
<% if current_user.admin? %>
|
||||||
<td>
|
<td>
|
||||||
<%= link_to "Delete", user_path(user), method: :delete, class: "btn btn-danger", data: { confirm: "Are you sure?" } %>
|
<%= link_to "Delete", user_path(user), method: :delete, class: "btn btn-danger", data: { confirm: "Are you sure?" } %>
|
||||||
|
|
|
@ -4,6 +4,13 @@
|
||||||
<%= render partial: 'flash' %>
|
<%= render partial: 'flash' %>
|
||||||
|
|
||||||
<table id="users-table" class="table table-striped">
|
<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 %>
|
<%= render @users %>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,10 +1,12 @@
|
||||||
<%= render partial: 'flash' %>
|
<%= render partial: 'flash' %>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="user_info">
|
<div class="user_info">
|
||||||
<h5>
|
<% if current_user == @user %>
|
||||||
<%= link_to "[Edit dagschotel]" , user_edit_dagschotel_path(@user) if current_user == @user %>
|
<h5>
|
||||||
<%= link_to "[Edit profile]" , edit_user_registration_path if current_user == @user %>
|
<%= link_to "[Edit dagschotel]" , user_edit_dagschotel_path(@user) %>
|
||||||
</h5>
|
<%= link_to "[Edit profile]" , edit_user_registration_path %>
|
||||||
|
</h5>
|
||||||
|
<% end %>
|
||||||
<h2><%= @user.nickname %></h2>
|
<h2><%= @user.nickname %></h2>
|
||||||
<%= button_to "PLACE ORDER!", new_user_order_path(@user), method: :get if current_user == @user %>
|
<%= button_to "PLACE ORDER!", new_user_order_path(@user), method: :get if current_user == @user %>
|
||||||
<div class="debt">DEBT: <%= euro(@user.debt) %></div>
|
<div class="debt">DEBT: <%= euro(@user.debt) %></div>
|
||||||
|
|
|
@ -75,7 +75,7 @@ end
|
||||||
|
|
||||||
50.times do |i|
|
50.times do |i|
|
||||||
User.create(
|
User.create(
|
||||||
nickname: "TestUser#{i}",
|
nickname: "testUser#{i}",
|
||||||
avatar: users[0][:avatar],
|
avatar: users[0][:avatar],
|
||||||
password: DEFAULT_PASSWORD,
|
password: DEFAULT_PASSWORD,
|
||||||
password_confirmation: DEFAULT_PASSWORD
|
password_confirmation: DEFAULT_PASSWORD
|
||||||
|
|
4
test/fixtures/users.yml
vendored
4
test/fixtures/users.yml
vendored
|
@ -30,14 +30,10 @@
|
||||||
|
|
||||||
benji:
|
benji:
|
||||||
nickname: benji
|
nickname: benji
|
||||||
name: Benjamin
|
|
||||||
last_name: Cousaert
|
|
||||||
dagschotel_id: 1
|
dagschotel_id: 1
|
||||||
|
|
||||||
iasoon:
|
iasoon:
|
||||||
nickname: iasoon
|
nickname: iasoon
|
||||||
name: Ilion
|
|
||||||
last_name: Beyst
|
|
||||||
|
|
||||||
admin:
|
admin:
|
||||||
nickname: admin
|
nickname: admin
|
||||||
|
|
|
@ -33,10 +33,6 @@ class UserTest < ActiveSupport::TestCase
|
||||||
@user = users(:benji)
|
@user = users(:benji)
|
||||||
end
|
end
|
||||||
|
|
||||||
test "full name" do
|
|
||||||
assert_equal @user.full_name, "Benjamin Cousaert"
|
|
||||||
end
|
|
||||||
|
|
||||||
test "debt behaves correctly" do
|
test "debt behaves correctly" do
|
||||||
assert_equal @user.debt_cents, 0
|
assert_equal @user.debt_cents, 0
|
||||||
assert_equal @user.debt, 0
|
assert_equal @user.debt, 0
|
||||||
|
|
Loading…
Reference in a new issue