From a84b8605a1ef286e0141d963f720d30d800217fb Mon Sep 17 00:00:00 2001 From: demesameneshoa Date: Wed, 20 Dec 2023 17:27:12 +0300 Subject: [PATCH 1/5] feat: Create the Recipe List - create recipt contoller - modify the recipe model to add the necessary validation - create recipe index to display the recipes for the user - create recipe form to add new recipe --- app/controllers/recipes_controller.rb | 9 +-- app/models/recipe.rb | 6 ++ app/views/recipes/_form.html.erb | 87 ++++++++++++++------------- app/views/recipes/index.html.erb | 45 ++++++++++---- app/views/recipes/new.html.erb | 15 ++--- 5 files changed, 98 insertions(+), 64 deletions(-) diff --git a/app/controllers/recipes_controller.rb b/app/controllers/recipes_controller.rb index e3e9699..8fe7767 100644 --- a/app/controllers/recipes_controller.rb +++ b/app/controllers/recipes_controller.rb @@ -3,7 +3,7 @@ class RecipesController < ApplicationController # GET /recipes or /recipes.json def index - @recipes = Recipe.all + @recipes = Recipe.where(user_id: current_user.id) end # GET /recipes/1 or /recipes/1.json @@ -20,11 +20,12 @@ def edit; end # POST /recipes or /recipes.json def create @recipe = Recipe.new(recipe_params) - + @recipe.user = current_user respond_to do |format| if @recipe.save - format.html { redirect_to recipe_url(@recipe), notice: 'Recipe was successfully created.' } - format.json { render :show, status: :created, location: @recipe } + format.html { redirect_to recipes_path, notice: 'Recipe was successfully created.' } + # format.html { redirect_to recipe_url(@recipe), notice: 'Recipe was successfully created.' } + # format.json { render :show, status: :created, location: @recipe } else format.html { render :new, status: :unprocessable_entity } format.json { render json: @recipe.errors, status: :unprocessable_entity } diff --git a/app/models/recipe.rb b/app/models/recipe.rb index 6afddb6..9cf025c 100644 --- a/app/models/recipe.rb +++ b/app/models/recipe.rb @@ -2,4 +2,10 @@ class Recipe < ApplicationRecord belongs_to :user has_many :recipe_foods has_many :foods, through: :recipe_foods + + validates :name, presence: true + validates :preparation_time, presence: true, numericality: { greater_than: 0 } + validates :cooking_time, presence: true, numericality: { greater_than: 0 } + validates :description, presence: true + validates :public, inclusion: { in: [true, false] } end diff --git a/app/views/recipes/_form.html.erb b/app/views/recipes/_form.html.erb index 0b83cec..af9586a 100644 --- a/app/views/recipes/_form.html.erb +++ b/app/views/recipes/_form.html.erb @@ -1,47 +1,50 @@ -<%= form_with(model: recipe) do |form| %> - <% if recipe.errors.any? %> -
-

<%= pluralize(recipe.errors.count, "error") %> prohibited this recipe from being saved:

- - + <%= form_with(model: recipe) do |form| %> + <% if recipe.errors.any? %> +
+

<%= pluralize(recipe.errors.count, "error") %> prohibited this recipe from being saved:

+ +
    + <% recipe.errors.each do |error| %> +
  • <%= error.full_message %>
    • + <% end %> +
+
+ <% end %> + +
+ <%= form.text_field :name, + placeholder: "Recipe Name", + aria: { label: "Recipe Name" }, + class: "form-control mb-2" %>
- <% end %> - -
- <%= form.label :name, style: "display: block" %> - <%= form.text_field :name %> -
-
- <%= form.label :preparation_time, style: "display: block" %> - <%= form.number_field :preparation_time %> -
- -
- <%= form.label :cooking_time, style: "display: block" %> - <%= form.number_field :cooking_time %> -
- -
- <%= form.label :description, style: "display: block" %> - <%= form.text_area :description %> -
+
+ <%= form.text_field :preparation_time, + placeholder: "Preparation Time", + aria: { label: "Preparation Time" }, + class: "form-control mb-2" %> +
-
- <%= form.label :public, style: "display: block" %> - <%= form.check_box :public %> -
+
+ <%= form.text_field :cooking_time, + placeholder: "Cooking Time", + aria: { label: "Cooking Time" }, + class: "form-control mb-2" %> +
-
- <%= form.label :user_id, style: "display: block" %> - <%= form.text_field :user_id %> -
+
+ <%= form.text_area :description, + placeholder: "Description", + aria: { label: "Description" }, + class: "form-control mb-2" %> +
-
- <%= form.submit %> -
-<% end %> +
+ <%= form.check_box :public, class: "custom-control-input", id:"publicswitch" %> + +
+
+
+ <%= form.submit "Save", class: "btn btn-success w-100" %> +
+ <% end %> diff --git a/app/views/recipes/index.html.erb b/app/views/recipes/index.html.erb index f1d03d6..606eac6 100644 --- a/app/views/recipes/index.html.erb +++ b/app/views/recipes/index.html.erb @@ -1,14 +1,37 @@ -

<%= notice %>

+
-

Recipes

+
+
+ <%= link_to "New Recipe", new_recipe_path, class: "btn btn-outline-primary m-1" %> +
+ <% if @recipes.empty? %> +
+

There are no recipes to show.

+
+ <% else %> + +
    + <% @recipes.each_with_index do |recipe, index| %> +
  • +
    -
    - <% @recipes.each do |recipe| %> - <%= render recipe %> -

    - <%= link_to "Show this recipe", recipe %> -

    - <% end %> -
    +
    + <%= link_to recipe_path(id: recipe.id) do %> +

    Recipe <%= index + 1 %>

    + <% end %> +
    +

    Name: <%= recipe.name %>

    + <%= button_to 'Remove', recipe_path(recipe), method: :delete, + class: "btn btn-primary" %> + +
    +
    + Description: <%= recipe.description %> +
    +
    • + <% end %> + <% end %> +
+
+
-<%= link_to "New recipe", new_recipe_path %> diff --git a/app/views/recipes/new.html.erb b/app/views/recipes/new.html.erb index f125426..3def126 100644 --- a/app/views/recipes/new.html.erb +++ b/app/views/recipes/new.html.erb @@ -1,9 +1,10 @@ -

New recipe

+

New recipe

+
+ <%= render "form", recipe: @recipe %> -<%= render "form", recipe: @recipe %> +
-
- -
- <%= link_to "Back to recipes", recipes_path %> -
+
+ <%= link_to "Back to recipes list", recipes_path, class: "btn btn-secondary px-2 py-1" %> +
+
\ No newline at end of file From ccf65b99b330bdccf77ccdf167bbf34d5cbc7a33 Mon Sep 17 00:00:00 2001 From: demesameneshoa Date: Wed, 20 Dec 2023 17:30:56 +0300 Subject: [PATCH 2/5] added units to food form unit of measurement and add routes path on navbar --- app/views/foods/_form.html.erb | 2 +- app/views/layouts/_navbar.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/foods/_form.html.erb b/app/views/foods/_form.html.erb index 6533093..2afed05 100644 --- a/app/views/foods/_form.html.erb +++ b/app/views/foods/_form.html.erb @@ -20,7 +20,7 @@
<%= form.select :measurement_unit, - options_for_select(["mg", "g", "kg", "l", "ml"]), + options_for_select(["mg", "g", "kg", "l", "ml","units"]), { prompt: "Select Measurement Unit" }, aria: { label: "Measurement unit" }, class: "form-control mb-2" %> diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb index ccc5074..fc11f6c 100644 --- a/app/views/layouts/_navbar.html.erb +++ b/app/views/layouts/_navbar.html.erb @@ -19,7 +19,7 @@ <%= link_to "My-recipes", root_path, class: "nav-link" %>
  • - <%= link_to "Food-List", root_path, class: "nav-link" %> + <%= link_to "Food-List", foods_path, class: "nav-link" %>
  • <%= link_to "Shopping-list", root_path, class: "nav-link" %> From 0c481f7d63a303e1aacee13225b62e4a3cc9154d Mon Sep 17 00:00:00 2001 From: demesameneshoa Date: Wed, 20 Dec 2023 17:32:17 +0300 Subject: [PATCH 3/5] test: create unit test for the recipe controller --- spec/controllers/recipes_controller_spec.rb | 91 +++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 spec/controllers/recipes_controller_spec.rb diff --git a/spec/controllers/recipes_controller_spec.rb b/spec/controllers/recipes_controller_spec.rb new file mode 100644 index 0000000..c88df3c --- /dev/null +++ b/spec/controllers/recipes_controller_spec.rb @@ -0,0 +1,91 @@ +require 'rails_helper' + +RSpec.describe RecipesController, type: :controller do + include Devise::Test::ControllerHelpers + let(:user) { create(:user) } + let(:valid_attributes) { attributes_for(:recipe, user:) } + let(:invalid_attributes) { attributes_for(:recipe, name: nil, user:) } + + before do + sign_in user + end + + describe 'GET #index' do + it 'returns a success response' do + get :index + expect(response).to be_successful + end + end + + describe 'GET #show' do + it 'returns a success response' do + recipe = Recipe.create! valid_attributes + get :show, params: { id: recipe.to_param } + expect(response).to be_successful + end + end + + describe 'GET #new' do + it 'returns a success response' do + get :new + expect(response).to be_successful + end + end + + describe 'POST #create' do + context 'with valid params' do + it 'creates a new Recipe' do + expect do + post :create, params: { recipe: valid_attributes } + end.to change(Recipe, :count).by(1) + end + + it 'redirects to the recipes index' do + post :create, params: { recipe: valid_attributes } + expect(response).to redirect_to(recipes_path) + end + end + end + + describe 'GET #edit' do + it 'returns a success response' do + recipe = Recipe.create! valid_attributes + get :edit, params: { id: recipe.to_param } + expect(response).to be_successful + end + end + + describe 'PUT #update' do + context 'with valid params' do + let(:new_attributes) { { name: 'New Recipe Name' } } + + it 'updates the requested recipe' do + recipe = Recipe.create! valid_attributes + put :update, params: { id: recipe.to_param, recipe: new_attributes } + recipe.reload + expect(recipe.name).to eq('New Recipe Name') + end + + it 'redirects to the recipe' do + recipe = Recipe.create! valid_attributes + put :update, params: { id: recipe.to_param, recipe: valid_attributes } + expect(response).to redirect_to(recipe_path(recipe)) + end + end + end + + describe 'DELETE #destroy' do + it 'destroys the requested recipe' do + recipe = Recipe.create! valid_attributes + expect do + delete :destroy, params: { id: recipe.to_param } + end.to change(Recipe, :count).by(-1) + end + + it 'redirects to the recipes list' do + recipe = Recipe.create! valid_attributes + delete :destroy, params: { id: recipe.to_param } + expect(response).to redirect_to(recipes_url) + end + end +end From 7d8690d22921f7106dfe4d84c716c983263c669c Mon Sep 17 00:00:00 2001 From: demesameneshoa Date: Wed, 20 Dec 2023 17:34:18 +0300 Subject: [PATCH 4/5] test: create test for recipe spec model and add recipe factories --- spec/factories/recipes.rb | 2 +- spec/models/recipe_spec.rb | 67 +++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/spec/factories/recipes.rb b/spec/factories/recipes.rb index 26b17b4..6cdc599 100644 --- a/spec/factories/recipes.rb +++ b/spec/factories/recipes.rb @@ -5,6 +5,6 @@ cooking_time { 1 } description { 'MyText' } public { false } - user { nil } + user { create(:user) } end end diff --git a/spec/models/recipe_spec.rb b/spec/models/recipe_spec.rb index 8e223d3..704ecf0 100644 --- a/spec/models/recipe_spec.rb +++ b/spec/models/recipe_spec.rb @@ -1,5 +1,70 @@ require 'rails_helper' RSpec.describe Recipe, type: :model do - pending "add some examples to (or delete) #{__FILE__}" + let(:recipe) { build(:recipe) } # ! non persisting object. It's not saved in the database. + + describe 'validations' do + context 'object itself' do + it 'should be valid' do + expect(recipe).to be_valid + end + end + + context 'name validations' do + it 'should be valid' do + expect(recipe.name).to be_present + end + + it 'should be invalid' do + recipe.name = nil + expect(recipe).to_not be_valid + end + end + + context 'preparation_time validations' do + it 'should be valid' do + expect(recipe.preparation_time).to be_present + expect(recipe.preparation_time).to be > 0 + end + + it 'should be invalid' do + recipe.preparation_time = nil + expect(recipe).to_not be_valid + end + end + + context 'cooking_time validations' do + it 'should be valid' do + expect(recipe.cooking_time).to be_present + expect(recipe.cooking_time).to be > 0 + end + + it 'should be invalid' do + recipe.cooking_time = nil + expect(recipe).to_not be_valid + end + end + + context 'description validations' do + it 'should be valid' do + expect(recipe.description).to be_present + end + + it 'should be invalid' do + recipe.description = nil + expect(recipe).to_not be_valid + end + end + + context 'public validations' do + it 'should be valid' do + expect(recipe.public).to be_in([true, false]) + end + + it 'should be invalid' do + recipe.public = nil + expect(recipe).to_not be_valid + end + end + end end From 495af673754712cb36b9256ebe17f096a5b63372 Mon Sep 17 00:00:00 2001 From: demesameneshoa Date: Wed, 20 Dec 2023 17:35:13 +0300 Subject: [PATCH 5/5] test: create integration test for the rcipes index --- spec/views/recipes/index.html.erb_spec.rb | 67 +++++++++++++---------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/spec/views/recipes/index.html.erb_spec.rb b/spec/views/recipes/index.html.erb_spec.rb index d07de4c..7c7785b 100644 --- a/spec/views/recipes/index.html.erb_spec.rb +++ b/spec/views/recipes/index.html.erb_spec.rb @@ -1,35 +1,42 @@ require 'rails_helper' -RSpec.describe 'recipes/index', type: :view do - before(:each) do - assign(:recipes, [ - Recipe.create!( - name: 'Name', - preparation_time: 2, - cooking_time: 3, - description: 'MyText', - public: false, - user: nil - ), - Recipe.create!( - name: 'Name', - preparation_time: 2, - cooking_time: 3, - description: 'MyText', - public: false, - user: nil - ) - ]) - end +RSpec.describe 'recipes/index', type: :system do + it 'displays a list of recipes or a message if empty' do + new_user = create(:user) + visit new_user_session_path + + fill_in 'Email', with: new_user.email + fill_in 'Password', with: new_user.password + + click_button 'Log in' + + create(:recipe, name: 'Pizza', preparation_time: 10, cooking_time: 20, description: 'MyText', public: false, + user: new_user) + create(:recipe, name: 'Salad', preparation_time: 5, cooking_time: 10, description: 'MyText', public: false, + user: new_user) + + visit recipes_path + + within('#recipes', wait: 5) do + expect(page).to have_link('New Recipe', href: new_recipe_path) + + expect(page).to have_selector('.p-2 a.btn', text: 'New Recipe') + + expect(page).to have_selector('.p-2 a.btn', text: 'New Recipe', count: 1) - it 'renders a list of recipes' do - render - cell_selector = Rails::VERSION::STRING >= '7' ? 'div>p' : 'tr>td' - assert_select cell_selector, text: Regexp.new('Name'.to_s), count: 2 - assert_select cell_selector, text: Regexp.new(2.to_s), count: 2 - assert_select cell_selector, text: Regexp.new(3.to_s), count: 2 - assert_select cell_selector, text: Regexp.new('MyText'.to_s), count: 2 - assert_select cell_selector, text: Regexp.new(false.to_s), count: 2 - assert_select cell_selector, text: Regexp.new(nil.to_s), count: 2 + if Recipe.all.empty? + expect(page).to have_selector('.alert.alert-info', text: 'There are no recipes to show.') + else + expect(page).to have_selector('ul') + expect(page).to have_selector('p', text: 'Recipe') + expect(page).to have_selector('p', text: 'Name') + expect(page).to have_selector('p', text: 'Pizza') + expect(page).to have_selector('p', text: 'Salad') + expect(page).to have_selector('li', count: 2) + expect(page).to have_content('Pizza') + expect(page).to have_content('Salad') + expect(page).to have_content('MyText', count: 2) + end + end end end