From 66c7533f47aa3dea250a5ec09822fe85a4c046c7 Mon Sep 17 00:00:00 2001 From: "Md. Tauhidul Islam" Date: Sun, 8 Feb 2015 02:03:34 +0600 Subject: [PATCH] - Fix test code for unique impressionist of instance with friendly_id - Fixed rspec-rails version for run previous test cases - Add friendly_id in gemfiles for run test case --- Gemfile | 1 - gemfiles/rails32.gemfile | 3 ++- gemfiles/rails40.gemfile | 3 ++- .../spec/controllers/impressionist_uniqueness_spec.rb | 7 +++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 71b0f6b..37823f5 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,6 @@ group :test do gem 'rspec-rails' gem 'simplecov' gem 'systemu' - gem 'friendly_id', '~> 4.0.9' end gemspec diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile index 8edb965..08a2fae 100644 --- a/gemfiles/rails32.gemfile +++ b/gemfiles/rails32.gemfile @@ -18,9 +18,10 @@ group :test do gem 'minitest' gem 'minitest-rails' gem 'rails', '~> 3.2.15' - gem 'rspec-rails' + gem 'rspec-rails', '~> 2.14.0' gem 'simplecov' gem 'systemu' + gem 'friendly_id', '~> 4.0.9' end gemspec :path => '../' diff --git a/gemfiles/rails40.gemfile b/gemfiles/rails40.gemfile index 60d8569..beb41c9 100644 --- a/gemfiles/rails40.gemfile +++ b/gemfiles/rails40.gemfile @@ -18,9 +18,10 @@ group :test do gem 'minitest' gem 'minitest-rails' gem 'rails', '~> 4.0.1' - gem 'rspec-rails' + gem 'rspec-rails', '~> 2.14.0' gem 'simplecov' gem 'systemu' + gem 'friendly_id', '~> 5.1.0' end gemspec :path => '../' diff --git a/tests/test_app/spec/controllers/impressionist_uniqueness_spec.rb b/tests/test_app/spec/controllers/impressionist_uniqueness_spec.rb index dd921cc..8fed026 100644 --- a/tests/test_app/spec/controllers/impressionist_uniqueness_spec.rb +++ b/tests/test_app/spec/controllers/impressionist_uniqueness_spec.rb @@ -308,12 +308,11 @@ describe DummyController do describe 'impressionist with friendly id' do it 'should unique' do - impressionable = Profile.find 1 - # get 'profiles/test_profile' - # get 'profiles/test_profile' + impressionable = Profile.create({username: 'test_profile', slug: 'test_profile'}) + controller.stub(:controller_name).and_return('profile') controller.stub(:action_name).and_return('show') - controller.stub(:params).and_return({id: 'test_profile'}) + controller.stub(:params).and_return({id: impressionable.slug}) controller.request.stub(:remote_ip).and_return('1.2.3.4') controller.impressionist(impressionable, nil, :unique => [:impressionable_type, :impressionable_id])