From 2f724934bf93d3948321c5104dd18adb6011fcc7 Mon Sep 17 00:00:00 2001 From: kolesnikov Date: Wed, 19 Aug 2015 20:51:42 +0300 Subject: [PATCH] Fix Exercise-13 solution --- app/controllers/reviews_controller.rb | 2 +- spec/models/card_spec.rb | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index 943db90..dcd5ab7 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -4,7 +4,7 @@ def new end def create - @card = Card.find(review_params[:card_id]) + @card = current_user.cards.find(review_params[:card_id]) if @card.review(review_params[:answer]) flash[:success] = "Right! Next review: #{@card.review_date.localtime}" else diff --git a/spec/models/card_spec.rb b/spec/models/card_spec.rb index aa282d8..fe7454b 100644 --- a/spec/models/card_spec.rb +++ b/spec/models/card_spec.rb @@ -2,9 +2,7 @@ describe Card do context "initialize" do - let(:invalid) do - FactoryGirl.build(:card, original_text: "foo", translated_text: "foo") - end + let(:invalid) { build(:card, original_text: "foo", translated_text: "foo") } it "invalid card" do expect(invalid).to be_invalid @@ -33,7 +31,7 @@ describe "#handle_correct_answer" do before(:each) do @original_date = card.review_date - right_review(card) + card.review(card.original_text) end context "after the first right review" do @@ -65,7 +63,7 @@ describe "#handle_incorrect_answer" do before(:each) do @original_date = card.review_date - wrong_review(card) + card.review("#{card.original_text}foo") end context "after the first wrong review" do @@ -84,11 +82,3 @@ end end end - -def right_review(card) - card.review(card.original_text) -end - -def wrong_review(card) - card.review("#{card.original_text}foo") -end