From 4b335c3f667552304303b9626537a7f53bb7d9fc Mon Sep 17 00:00:00 2001
From: kd00506 <kd00506@surrey.ac.uk>
Date: Sat, 28 Nov 2020 17:04:36 +0000
Subject: [PATCH] Amended tests post clean up
---
app/controllers/contact_controller.rb | 13 +++---
test/controllers/lists_controller_test.rb | 48 --------------------
test/controllers/products_controller_test.rb | 48 --------------------
test/controllers/users_controller_test.rb | 48 --------------------
4 files changed, 6 insertions(+), 151 deletions(-)
delete mode 100644 test/controllers/lists_controller_test.rb
delete mode 100644 test/controllers/products_controller_test.rb
delete mode 100644 test/controllers/users_controller_test.rb
diff --git a/app/controllers/contact_controller.rb b/app/controllers/contact_controller.rb
index 802ccb6..30c12a1 100644
--- a/app/controllers/contact_controller.rb
+++ b/app/controllers/contact_controller.rb
@@ -1,13 +1,12 @@
class ContactController < ApplicationController
def contact
- if session[:user_id].nil?
+ if session[:user_id].blank?
redirect_to homepage_path
else
+ @username = User.find(session[:user_id]).name
+ @pagename = t('.page_title')
@email = User.find(session[:user_id]).email
end
-
- @username = User.find(session[:user_id]).name
- @pagename = t('.page_title')
end
def sendmessage
@@ -17,9 +16,9 @@ class ContactController < ApplicationController
elsif params[:message].blank?
flash[:alert] = t('.contact.blank_message')
redirect_to contact_path
- elsif params[:email] =~ URI::MailTso::EMAIL_REGEXP
- ContactMailer.contact_email(params[:email], params[:message]).deliver_now
- redirect_to homepage_path
+ elsif params[:email] =~ URI::MailTo::EMAIL_REGEXP
+ ContactMailer.contact_email(params[:email], params[:message]).deliver_now
+ redirect_to homepage_path
else
flash[:alert] = t('.contact.invalid')
redirect_to contact_path
diff --git a/test/controllers/lists_controller_test.rb b/test/controllers/lists_controller_test.rb
deleted file mode 100644
index be9250f..0000000
--- a/test/controllers/lists_controller_test.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require 'test_helper'
-
-class ListsControllerTest < ActionDispatch::IntegrationTest
- setup do
- @list = lists(:one)
- end
-
- test 'should get index' do
- get lists_url
- assert_response :success
- end
-
- test 'should get new' do
- get new_list_url
- assert_response :success
- end
-
- test 'should create list' do
- assert_difference('List.count') do
- post lists_url, params: { list: { name: @list.name + "test", user_id: @list.user_id } }
- end
-
- assert_redirected_to list_url(List.last)
- end
-
- test 'should show list' do
- get list_url(@list)
- assert_response :success
- end
-
- test 'should get edit' do
- get edit_list_url(@list)
- assert_response :success
- end
-
- test 'should update list' do
- patch list_url(@list), params: { list: { name: @list.name + "test", user_id: @list.user_id } }
- assert_redirected_to list_url(@list)
- end
-
- test 'should destroy list' do
- assert_difference('List.count', -1) do
- delete list_url(@list)
- end
-
- assert_redirected_to lists_url
- end
-end
diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb
deleted file mode 100644
index 4bbc6af..0000000
--- a/test/controllers/products_controller_test.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require 'test_helper'
-
-class ProductsControllerTest < ActionDispatch::IntegrationTest
- setup do
- @product = products(:one)
- end
-
- test 'should get index' do
- get products_url
- assert_response :success
- end
-
- test 'should get new' do
- get new_product_url
- assert_response :success
- end
-
- test 'should create product' do
- assert_difference('Product.count') do
- post products_url, params: { product: { acquired: @product.acquired, list_id: @product.list_id, name: @product.name + "test", quantity: @product.quantity } }
- end
-
- assert_redirected_to product_url(Product.last)
- end
-
- test 'should show product' do
- get product_url(@product)
- assert_response :success
- end
-
- test 'should get edit' do
- get edit_product_url(@product)
- assert_response :success
- end
-
- test 'should update product' do
- patch product_url(@product), params: { product: { acquired: @product.acquired, list_id: @product.list_id, name: @product.name + "test", quantity: @product.quantity } }
- assert_redirected_to product_url(@product)
- end
-
- test 'should destroy product' do
- assert_difference('Product.count', -1) do
- delete product_url(@product)
- end
-
- assert_redirected_to products_url
- end
-end
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
deleted file mode 100644
index c5db10e..0000000
--- a/test/controllers/users_controller_test.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require 'test_helper'
-
-class UsersControllerTest < ActionDispatch::IntegrationTest
- setup do
- @user = users(:one)
- end
-
- test 'should get index' do
- get users_url
- assert_response :success
- end
-
- test 'should get new' do
- get new_user_url
- assert_response :success
- end
-
- test 'should create user' do
- assert_difference('User.count') do
- post users_url, params: { user: { email: @user.email + 'testing', name: @user.name, password: @user.password } }
- end
-
- assert_redirected_to user_url(User.last)
- end
-
- test 'should show user' do
- get user_url(@user)
- assert_response :success
- end
-
- test 'should get edit' do
- get edit_user_url(@user)
- assert_response :success
- end
-
- test 'should update user' do
- patch user_url(@user), params: { user: { email: @user.email, name: @user.name, password: @user.password } }
- assert_redirected_to user_url(@user)
- end
-
- test 'should destroy user' do
- assert_difference('User.count', -1) do
- delete user_url(@user)
- end
-
- assert_redirected_to users_url
- end
-end
--
GitLab