solidus_reviews 1.2.0 → 1.5.0

data/spec/controllers/spree/feedback_reviews_controller_spec.rb

@@ -27,11 +27,11 @@ describe Spree::FeedbackReviewsController do
       comment = ['Thanks for your review!', 'Cheers'].join("\n")
       expect {
         post :create, params: { review_id: review.id,
-                        feedback_review: {
-                          comment: comment,
-                          rating: rating
-},
-                        format: :js }
+                                feedback_review: {
+                                  comment: comment,
+                                  rating: rating
+                                },
+                                format: :js }
         expect(response.status).to eq(200)
         expect(response).to render_template(:create)
       }.to change(Spree::Review, :count).by(1)
@@ -48,7 +48,7 @@ describe Spree::FeedbackReviewsController do
     end
 
     it 'sets locale on feedback-review if required by config' do
-      Spree::Reviews::Config.preferred_track_locale = true
+      stub_spree_preferences(Spree::Reviews::Config, track_locale: true)
       post :create, params: valid_attributes
       expect(assigns[:review].locale).to eq I18n.locale.to_s
     end
@@ -58,7 +58,7 @@ describe Spree::FeedbackReviewsController do
 
       expect {
         post :create, params: valid_attributes
-      }.to raise_error
+      }.to raise_error(RuntimeError)
     end
 
     it 'removes all non-numbers from ratings parameter' do
@@ -68,7 +68,7 @@ describe Spree::FeedbackReviewsController do
 
     it 'do not create feedback-review if review doesnt exist' do
       expect {
-        post :create, params: valid_attributes.merge!({ review_id: nil })
+        post :create, params: valid_attributes.merge!(review_id: nil)
       }.to raise_error ActionController::UrlGenerationError
     end
   end

data/spec/controllers/spree/reviews_controller_spec.rb

@@ -5,6 +5,7 @@ require 'spec_helper'
 describe Spree::ReviewsController, type: :controller do
   let(:user) { create(:user) }
   let(:product) { create(:product) }
+  let(:review) { create(:review, :approved, product: product, user: user) }
   let(:review_params) do
     { product_id: product.slug,
       review: { rating: 3,
@@ -12,9 +13,8 @@ describe Spree::ReviewsController, type: :controller do
                 title: 'Great Product',
                 review: 'Some big review text..',
                 images: [
-                  fixture_file_upload(File.new(Spree::Core::Engine.root + 'spec/fixtures/thinking-cat.jpg'))
-                ] }
-    }
+                  fixture_file_upload(File.new('spec/fixtures/thinking-cat.jpg'))
+                ] } }
   end
 
   before do
@@ -22,7 +22,7 @@ describe Spree::ReviewsController, type: :controller do
     allow(controller).to receive(:spree_user_signed_in?).and_return(true)
   end
 
-  context '#index' do
+  describe '#index' do
     context 'for a product that does not exist' do
       it 'responds with a 404' do
         expect {
@@ -43,7 +43,7 @@ describe Spree::ReviewsController, type: :controller do
     end
   end
 
-  context '#new' do
+  describe '#new' do
     context 'for a product that does not exist' do
       it 'responds with a 404' do
         expect {
@@ -68,7 +68,40 @@ describe Spree::ReviewsController, type: :controller do
     end
   end
 
-  context '#create' do
+  describe '#edit' do
+    context 'for a product that does not exist' do
+      it 'responds with a 404' do
+        expect {
+          get :edit, params: { id: review.id, product_id: 'not_real' }
+        }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+
+    it 'fail if the user is not authorized to edit a review' do
+      allow(controller).to receive(:authorize!).and_raise(RuntimeError)
+
+      expect {
+        post :edit, params: { id: review.id, product_id: product.slug }
+        assert_match 'ryanbig', response.body
+      }.to raise_error RuntimeError
+    end
+
+    it 'render the edit template' do
+      get :edit, params: { id: review.id, product_id: product.slug }
+      expect(response.status).to eq(200)
+      expect(response).to render_template(:edit)
+    end
+
+    it 'doesn\'t allow another user to update a users review' do
+      other_user = create(:user)
+      allow(controller).to receive(:spree_current_user).and_return(other_user)
+      get :edit, params: { id: review.id, product_id: product.slug }
+      expect(response).not_to render_template(:edit)
+      expect(flash[:error]).to eq "Authorization Failure"
+    end
+  end
+
+  describe '#create' do
     before { allow(controller).to receive(:spree_current_user).and_return(user) }
 
     context 'for a product that does not exist' do
@@ -146,7 +179,7 @@ describe Spree::ReviewsController, type: :controller do
 
       it 'does not create a review' do
         expect(Spree::Review.count).to eq 0
-        post :create, params: review_params.merge({ review: { rating: 'not_a_number' } })
+        post :create, params: review_params.merge(review: { rating: 'not_a_number' })
         expect(Spree::Review.count).to eq 0
       end
     end
@@ -154,10 +187,114 @@ describe Spree::ReviewsController, type: :controller do
     # It always sets the locale so preference pointless
     context 'when config requires locale tracking:' do
       it 'sets the locale' do
-        Spree::Reviews::Config.preferred_track_locale = true
+        stub_spree_preferences(Spree::Reviews::Config, track_locale: true)
         post :create, params: review_params
         expect(assigns[:review].locale).to eq I18n.locale.to_s
       end
     end
   end
+
+  describe '#update' do
+    before {
+      allow(controller).to receive(:spree_current_user).and_return(user)
+      @review_params = {
+        product_id: product.slug,
+        id: review.id,
+        review: { title: 'Amazing Product' }
+      }
+    }
+
+    context 'for a product that does not exist' do
+      it 'responds with a 404' do
+        expect {
+          post :update, params: { id: review.id, product_id: 'not_real' }
+        }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+
+    it 'updates a review' do
+      post :update, params: @review_params
+
+      expect(assigns[:review].title).to eq 'Amazing Product'
+      expect(assigns[:review].product).to eq product
+      expect(assigns[:review].user).to eq user
+    end
+
+    it 'updates a review to be a rating only review' do
+      post :update, params: {
+        product_id: product.slug,
+        id: review.id,
+        review: { title: '', review: '', rating: 5 }
+      }
+
+      expect(assigns[:review].title).to eq ''
+      expect(assigns[:review].review).to eq ''
+      expect(assigns[:review].rating).to eq 5
+    end
+
+    it 'updates the attached image' do
+      post :update, params: {
+        product_id: product.slug,
+        id: review.id,
+        review: {
+          images: [
+            fixture_file_upload(File.new('spec/fixtures/thinking-cat.jpg')),
+          ]
+        }
+      }
+      expect(assigns[:review].images.count).to eq 1
+    end
+
+    it 'fails if the user is not authorized to create a review' do
+      allow(controller).to receive(:authorize!).and_raise(RuntimeError)
+
+      expect{
+        post :update, params: @review_params
+      }.to raise_error RuntimeError
+    end
+
+    it 'flashes the notice' do
+      post :update, params: @review_params
+
+      expect(flash[:notice]).to eq I18n.t('spree.review_successfully_submitted')
+    end
+
+    it 'redirects to product page' do
+      post :update, params: @review_params
+      review.reload
+      review.valid?
+      expect(response).to redirect_to spree.product_path(product)
+    end
+
+    it 'removes all non-numbers from ratings param' do
+      @review_params[:review][:rating] = 5
+      post :update, params: @review_params
+      expect(controller.params[:review][:rating]).to eq '5'
+    end
+
+    it 'doesnt change the current spree user as reviews user' do
+      post :update, params: @review_params
+      expect(assigns[:review].user_id).to eq user.id
+    end
+
+    context 'with invalid params' do
+      it 'renders edit when review.save fails' do
+        expect_any_instance_of(Spree::Review).to receive(:update).and_return(false)
+        post :update, params: @review_params
+        expect(response).to render_template :edit
+      end
+
+      it 'does not update a review' do
+        original_rating = review.rating
+        original_title = review.title
+        @review_params[:review][:rating] = 'not_a_number'
+        @review_params[:review][:title] = true
+        post :update, params: @review_params
+
+        review.reload
+        expect(review.rating).to eq original_rating
+        expect(review.title).to eq original_title
+      end
+    end
+  end
 end

data/spec/features/admin_spec.rb

@@ -2,21 +2,21 @@
 
 require 'spec_helper'
 
-RSpec.feature 'Review Admin' do
+RSpec.describe 'Review Admin' do
   stub_authorization!
 
-  given!(:review) { create(:review) }
+  let!(:review) { create(:review) }
 
   context 'index' do
-    background do
+    before do
       visit spree.admin_reviews_path
     end
 
-    scenario 'list reviews' do
+    it 'list reviews' do
       expect(page).to have_text review.product.name
     end
 
-    scenario 'approve reviews' do
+    it 'approve reviews' do
       expect(review.approved).to be false
       within("tr#review_#{review.id}") do
         find('.approve').click
@@ -24,7 +24,7 @@ RSpec.feature 'Review Admin' do
       expect(review.reload.approved).to be true
     end
 
-    scenario 'edit reviews' do
+    it 'edit reviews' do
       expect(page).to have_text review.product.name
       within("tr#review_#{review.id}") do
         find('.edit').click

data/spec/features/reviews_spec.rb

@@ -2,90 +2,91 @@
 
 require 'spec_helper'
 
-feature 'Reviews', js: true do
-  given!(:someone) { create(:user, email: 'ryan@spree.com') }
-  given!(:review) { create(:review, :approved, user: someone) }
-  given!(:unapproved_review) { create(:review, product: review.product) }
+describe 'Reviews', js: true do
+  let!(:someone) { create(:user, email: 'ryan@spree.com') }
+  let!(:review) { create(:review, :approved, user: someone) }
+  let!(:unapproved_review) { create(:review, product: review.product) }
 
-  background do
-    Spree::Reviews::Config.include_unapproved_reviews = false
+  before do
+    stub_spree_preferences(Spree::Reviews::Config, include_unapproved_reviews: false)
   end
 
   context 'product with no review' do
-    given!(:product_no_reviews) { create(:product) }
-    scenario 'informs that no reviews has been written yet' do
+    let!(:product_no_reviews) { create(:product) }
+
+    it 'informs that no reviews has been written yet' do
       visit spree.product_path(product_no_reviews)
       expect(page).to have_text I18n.t('spree.no_reviews_available')
     end
 
     # Regression test for #103
     context "shows correct number of previews" do
-      background do
+      before do
         FactoryBot.create_list :review, 3, product: product_no_reviews, approved: true
-        Spree::Reviews::Config[:preview_size] = 2
+        stub_spree_preferences(Spree::Reviews::Config, preview_size: 2)
       end
 
-      scenario "displayed reviews are limited by the set preview size" do
+      it "displayed reviews are limited by the set preview size" do
         visit spree.product_path(product_no_reviews)
-        expect(page.all(".review").count).to eql(2)
+        expect(page.all(".review").count).to be(2)
       end
     end
   end
 
   context 'when anonymous user' do
-    background do
-      Spree::Reviews::Config.require_login = true
+    before do
+      stub_spree_preferences(Spree::Reviews::Config, require_login: true)
     end
 
     context 'visit product with review' do
-      background do
+      before do
         visit spree.product_path(review.product)
       end
 
-      scenario 'should see review title' do
+      it 'sees review title' do
         expect(page).to have_text review.title
       end
 
-      scenario 'can not create review' do
+      it 'can not create review' do
         expect(page).not_to have_text I18n.t('spree.write_your_own_review')
       end
     end
   end
 
   context 'when logged in user' do
-    given!(:user) { create(:user) }
+    let!(:user) { create(:user) }
 
-    background do
+    before do
       sign_in_as! user
     end
 
     context 'visit product with review' do
-      background do
+      before do
         visit spree.product_path(review.product)
       end
 
-      scenario 'can see review title' do
+      it 'can see review title' do
         expect(page).to have_text review.title
       end
 
       context 'with unapproved content allowed' do
-        background do
-          Spree::Reviews::Config[:include_unapproved_reviews] = true
-          Spree::Reviews::Config[:display_unapproved_reviews] = true
+        before do
+          stub_spree_preferences(Spree::Reviews::Config, include_unapproved_reviews: true)
+          stub_spree_preferences(Spree::Reviews::Config, display_unapproved_reviews: true)
           visit spree.product_path(review.product)
         end
 
-        scenario 'can see unapproved content when allowed' do
+        it 'can see unapproved content when allowed' do
           expect(unapproved_review.approved?).to eq(false)
           expect(page).to have_text unapproved_review.title
         end
       end
 
-      scenario 'can see create new review button' do
+      it 'can see create new review button' do
         expect(page).to have_text I18n.t('spree.write_your_own_review')
       end
 
-      scenario 'can create new review' do
+      it 'can create new review' do
         click_on I18n.t('spree.write_your_own_review')
 
         expect(page).to have_text I18n.t('spree.leave_us_a_review_for', name: review.product.name)
@@ -97,7 +98,7 @@ feature 'Reviews', js: true do
           fill_in 'review_name', with: user.email
           fill_in 'review_title', with: 'Great product!'
           fill_in 'review_review', with: 'Some big review text..'
-          attach_file 'review_images', Spree::Core::Engine.root + 'spec/fixtures/thinking-cat.jpg'
+          attach_file 'review_images', 'spec/fixtures/thinking-cat.jpg'
           click_on 'Submit your review'
         end
 
@@ -108,14 +109,14 @@ feature 'Reviews', js: true do
   end
 
   context 'visit product with review where show_identifier is false' do
-    given!(:user) { create(:user) }
-    given!(:review) { create(:review, :approved, :hide_identifier, review: 'review text', user: user) }
+    let!(:user) { create(:user) }
+    let!(:review) { create(:review, :approved, :hide_identifier, review: 'review text', user: user) }
 
-    background do
+    before do
       visit spree.product_path(review.product)
     end
 
-    scenario 'show anonymous review' do
+    it 'show anonymous review' do
       expect(page).to have_text I18n.t('spree.anonymous')
       expect(page).to have_text 'review text'
     end

data/spec/models/feedback_review_spec.rb

@@ -13,30 +13,30 @@ describe Spree::FeedbackReview do
     end
 
     it 'does not validate with a nil review' do
-      expect(build(:feedback_review, review: nil)).to_not be_valid
+      expect(build(:feedback_review, review: nil)).not_to be_valid
     end
 
     context 'rating' do
       it 'does not validate when no rating is specified' do
-        expect(build(:feedback_review, rating: nil)).to_not be_valid
+        expect(build(:feedback_review, rating: nil)).not_to be_valid
       end
 
       it 'does not validate when the rating is not a number' do
-        expect(build(:feedback_review, rating: 'not_a_number')).to_not be_valid
+        expect(build(:feedback_review, rating: 'not_a_number')).not_to be_valid
       end
 
       it 'does not validate when the rating is a float' do
-        expect(build(:feedback_review, rating: 2.718)).to_not be_valid
+        expect(build(:feedback_review, rating: 2.718)).not_to be_valid
       end
 
       it 'does not validate when the rating is less than 1' do
-        expect(build(:feedback_review, rating: 0)).to_not be_valid
-        expect(build(:feedback_review, rating: -5)).to_not be_valid
+        expect(build(:feedback_review, rating: 0)).not_to be_valid
+        expect(build(:feedback_review, rating: -5)).not_to be_valid
       end
 
       it 'does not validate when the rating is greater than 5' do
-        expect(build(:feedback_review, rating: 6)).to_not be_valid
-        expect(build(:feedback_review, rating: 8)).to_not be_valid
+        expect(build(:feedback_review, rating: 6)).not_to be_valid
+        expect(build(:feedback_review, rating: 8)).not_to be_valid
       end
 
       (1..5).each do |i|
@@ -54,11 +54,11 @@ describe Spree::FeedbackReview do
       let!(:feedback_review_3) { create(:feedback_review, created_at: 5.days.ago) }
 
       it 'properly runs most_recent_first queries' do
-        expect(Spree::FeedbackReview.most_recent_first.to_a).to eq([feedback_review_2, feedback_review_3, feedback_review_1])
+        expect(described_class.most_recent_first.to_a).to eq([feedback_review_2, feedback_review_3, feedback_review_1])
       end
 
       it 'defaults to most_recent_first queries' do
-        expect(Spree::FeedbackReview.all.to_a).to eq([feedback_review_2, feedback_review_3, feedback_review_1])
+        expect(described_class.all.to_a).to eq([feedback_review_2, feedback_review_3, feedback_review_1])
       end
     end
 
@@ -71,9 +71,9 @@ describe Spree::FeedbackReview do
       let!(:fr_feedback_review_1) { create(:feedback_review, locale: 'fr', created_at: 10.days.ago) }
 
       it 'properly runs localized queries' do
-        expect(Spree::FeedbackReview.localized('en').to_a).to eq([en_feedback_review_2, en_feedback_review_3, en_feedback_review_1])
-        expect(Spree::FeedbackReview.localized('es').to_a).to eq([es_feedback_review_1])
-        expect(Spree::FeedbackReview.localized('fr').to_a).to eq([fr_feedback_review_1])
+        expect(described_class.localized('en').to_a).to eq([en_feedback_review_2, en_feedback_review_3, en_feedback_review_1])
+        expect(described_class.localized('es').to_a).to eq([es_feedback_review_1])
+        expect(described_class.localized('fr').to_a).to eq([fr_feedback_review_1])
       end
     end
   end

data/spec/models/product_spec.rb

@@ -7,7 +7,7 @@ describe Spree::Product do
   it { is_expected.to respond_to(:reviews) }
   it { is_expected.to respond_to(:stars) }
 
-  context '#stars' do
+  describe '#stars' do
     let(:product) { build(:product) }
 
     it 'rounds' do
@@ -27,7 +27,7 @@ describe Spree::Product do
     end
   end
 
-  context '#recalculate_rating' do
+  describe '#recalculate_rating' do
     let!(:product) { create(:product) }
 
     context 'when there are approved reviews' do
@@ -36,11 +36,8 @@ describe Spree::Product do
       let!(:unapproved_review_1) { create(:review, product: product, approved: false, rating: 4) }
 
       context "including unapproved reviews" do
-        before(:all) do
-          Spree::Reviews::Config[:include_unapproved_reviews] = true
-        end
-        after(:all) do
-          Spree::Reviews::Config[:include_unapproved_reviews] = false
+        before do
+          stub_spree_preferences(Spree::Reviews::Config, include_unapproved_reviews: true)
         end
 
         it "updates the product average rating and ignores unapproved reviews" do
@@ -55,6 +52,10 @@ describe Spree::Product do
       end
 
       context "only approved reviews" do
+        before do
+          stub_spree_preferences(Spree::Reviews::Config, include_unapproved_reviews: false)
+        end
+
         it "updates the product average rating and ignores unapproved reviews" do
           product.avg_rating = 0
           product.reviews_count = 0
@@ -70,10 +71,12 @@ describe Spree::Product do
     context "without unapproved reviews" do
       let!(:unapproved_review_1) { create(:review, product: product, approved: false, rating: 4) }
 
+      before do
+        stub_spree_preferences(Spree::Reviews::Config, include_unapproved_reviews: false)
+      end
+
       it "updates the product average rating and ignores unapproved reviews" do
-        product.avg_rating = 3
-        product.reviews_count = 20
-        product.save!
+        product.update_columns(avg_rating: 3, reviews_count: 20)
 
         product.recalculate_rating
         expect(product.avg_rating).to eq(0)