From 9e525c09a195c69c70abd930003d2d4ca67ae73f Mon Sep 17 00:00:00 2001 From: Andrey Leontev Date: Wed, 23 Oct 2019 14:39:35 +1000 Subject: [PATCH 1/3] improve readability --- spec/controllers/inquiries_controller_spec.rb | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/spec/controllers/inquiries_controller_spec.rb b/spec/controllers/inquiries_controller_spec.rb index 694be650f..3a36c693b 100644 --- a/spec/controllers/inquiries_controller_spec.rb +++ b/spec/controllers/inquiries_controller_spec.rb @@ -1,17 +1,19 @@ require "spec_helper" RSpec.describe InquiriesController do - let (:test_organization) { Fabricate(:organization) } - let (:member) { Fabricate(:member, organization: test_organization) } - let (:another_member) { Fabricate(:member, organization: test_organization) } - let (:test_category) { Fabricate(:category) } - let! (:inquiry) do + let(:test_organization) { Fabricate(:organization) } + let(:member) { Fabricate(:member, organization: test_organization) } + let(:another_member) { Fabricate(:member, organization: test_organization) } + let(:test_category) { Fabricate(:category) } + let!(:inquiry) do Fabricate(:inquiry, user: member.user, organization: test_organization, category: test_category) end + include_context "stub browser locale" + before { set_browser_locale("ca") } describe "GET #index" do @@ -27,7 +29,7 @@ describe "GET #show" do context "with valid params" do - context "with a logged user" do + context "with a logged user" do it "assigns the requested inquiry to @inquiry" do login(another_member.user) @@ -40,10 +42,10 @@ describe "POST #create" do context "with valid params" do - context "with a logged user" do + context "with a logged user" do it "creates a new inquiry" do login(another_member.user) - + expect do post "create", inquiry: { user: another_member.user, category_id: test_category.id, @@ -57,16 +59,14 @@ describe "PUT #update" do context "with valid params" do context "with a logged user" do + before { login(another_member.user) } + it "located the requested @inquiry" do - login(member.user) - put "update", id: inquiry.id, inquiry: Fabricate.to_params(:inquiry) expect(assigns(:inquiry)).to eq(inquiry) end it "changes @inquiry's attributes" do - login(member.user) - put "update", id: inquiry.id, inquiry: Fabricate.to_params(:inquiry, @@ -84,9 +84,9 @@ end context "with invalid params" do - context "with a logged user" do + context "with a logged user" do it "does not change @inquiry's attributes" do - login(member.user) + login(another_member.user) put :update, id: inquiry.id, @@ -103,9 +103,9 @@ end describe "DELETE destroy" do + before { login(another_member.user) } + it "toggle active field" do - login(member.user) - delete :destroy, id: inquiry.id inquiry.reload @@ -113,8 +113,6 @@ end it "redirects to inquiries#index" do - login(member.user) - delete :destroy, id: inquiry.id expect(response).to redirect_to inquiries_url end From 13f6a8ed61d626145d4a885da4150093f607cdb1 Mon Sep 17 00:00:00 2001 From: Andrey Leontev Date: Thu, 24 Oct 2019 11:31:47 +1000 Subject: [PATCH 2/3] fix syntax --- spec/controllers/inquiries_controller_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/controllers/inquiries_controller_spec.rb b/spec/controllers/inquiries_controller_spec.rb index 3a36c693b..2827e450a 100644 --- a/spec/controllers/inquiries_controller_spec.rb +++ b/spec/controllers/inquiries_controller_spec.rb @@ -59,7 +59,7 @@ describe "PUT #update" do context "with valid params" do context "with a logged user" do - before { login(another_member.user) } + before { login(member.user) } it "located the requested @inquiry" do put "update", id: inquiry.id, inquiry: Fabricate.to_params(:inquiry) @@ -86,7 +86,7 @@ context "with invalid params" do context "with a logged user" do it "does not change @inquiry's attributes" do - login(another_member.user) + login(member.user) put :update, id: inquiry.id, @@ -103,7 +103,7 @@ end describe "DELETE destroy" do - before { login(another_member.user) } + before { login(member.user) } it "toggle active field" do delete :destroy, id: inquiry.id From ade9dfd1ef7a22c6e4101796d5713a178bf6736a Mon Sep 17 00:00:00 2001 From: Andrey Leontev Date: Fri, 25 Oct 2019 10:23:47 +1000 Subject: [PATCH 3/3] remove trailing spaces --- spec/controllers/inquiries_controller_spec.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/controllers/inquiries_controller_spec.rb b/spec/controllers/inquiries_controller_spec.rb index 2827e450a..495c13a4f 100644 --- a/spec/controllers/inquiries_controller_spec.rb +++ b/spec/controllers/inquiries_controller_spec.rb @@ -29,7 +29,7 @@ describe "GET #show" do context "with valid params" do - context "with a logged user" do + context "with a logged user" do it "assigns the requested inquiry to @inquiry" do login(another_member.user) @@ -45,7 +45,6 @@ context "with a logged user" do it "creates a new inquiry" do login(another_member.user) - expect do post "create", inquiry: { user: another_member.user, category_id: test_category.id,