Kouhei Sutou
null+****@clear*****
Mon Dec 12 11:55:22 JST 2016
Kouhei Sutou 2016-12-12 11:55:22 +0900 (Mon, 12 Dec 2016) New Revision: fb3fda7f9da2d0bf493b7f5b5b5be98e4b7f2b68 https://github.com/ranguba/groonga-client-rails/commit/fb3fda7f9da2d0bf493b7f5b5b5be98e4b7f2b68 Message: test rails5 activerecord: use fixture Because it's the default. Added files: test/apps/rails5-activerecord/test/fixtures/posts.yml Removed files: test/apps/rails5-activerecord/test/factories/posts.rb Modified files: test/apps/rails5-activerecord/Gemfile test/apps/rails5-activerecord/Gemfile.lock test/apps/rails5-activerecord/test/controllers/posts_controller_test.rb test/apps/rails5-activerecord/test/searchers/posts_searcher_test.rb test/apps/rails5-activerecord/test/test_helper.rb Modified: test/apps/rails5-activerecord/Gemfile (+0 -2) =================================================================== --- test/apps/rails5-activerecord/Gemfile 2016-12-12 11:54:52 +0900 (8aeb9bc) +++ test/apps/rails5-activerecord/Gemfile 2016-12-12 11:55:22 +0900 (c871b0c) @@ -36,8 +36,6 @@ gem 'groonga-client', path: '../../../../groonga-client' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug', platform: :mri - - gem 'factory_girl_rails' end group :development do Modified: test/apps/rails5-activerecord/Gemfile.lock (+0 -6) =================================================================== --- test/apps/rails5-activerecord/Gemfile.lock 2016-12-12 11:54:52 +0900 (abcf155) +++ test/apps/rails5-activerecord/Gemfile.lock 2016-12-12 11:55:22 +0900 (617fefd) @@ -67,11 +67,6 @@ GEM debug_inspector (0.0.2) erubis (2.7.0) execjs (2.7.0) - factory_girl (4.7.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.7.0) - factory_girl (~> 4.7.0) - railties (>= 3.0.0) ffi (1.9.14) globalid (0.3.7) activesupport (>= 4.1.0) @@ -179,7 +174,6 @@ PLATFORMS DEPENDENCIES byebug coffee-rails (~> 4.2) - factory_girl_rails groonga-client! groonga-client-rails! jbuilder (~> 2.5) Modified: test/apps/rails5-activerecord/test/controllers/posts_controller_test.rb (+1 -1) =================================================================== --- test/apps/rails5-activerecord/test/controllers/posts_controller_test.rb 2016-12-12 11:54:52 +0900 (fa55cf7) +++ test/apps/rails5-activerecord/test/controllers/posts_controller_test.rb 2016-12-12 11:55:22 +0900 (f69b61a) @@ -4,7 +4,7 @@ class PostsControllerTest < ActionDispatch::IntegrationTest include Groonga::Client::Rails::TestHelper setup do - @post = create(:post) + @post = posts(:one) end test "should get index" do Deleted: test/apps/rails5-activerecord/test/factories/posts.rb (+0 -6) 100644 =================================================================== --- test/apps/rails5-activerecord/test/factories/posts.rb 2016-12-12 11:54:52 +0900 (28b7437) +++ /dev/null @@ -1,6 +0,0 @@ -FactoryGirl.define do - factory :post do - title "MyString" - body "MyText" - end -end Added: test/apps/rails5-activerecord/test/fixtures/posts.yml (+9 -0) 100644 =================================================================== --- /dev/null +++ test/apps/rails5-activerecord/test/fixtures/posts.yml 2016-12-12 11:55:22 +0900 (e192dee) @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + body: MyText + +two: + title: MyString + body: MyText Modified: test/apps/rails5-activerecord/test/searchers/posts_searcher_test.rb (+15 -14) =================================================================== --- test/apps/rails5-activerecord/test/searchers/posts_searcher_test.rb 2016-12-12 11:54:52 +0900 (6b181fe) +++ test/apps/rails5-activerecord/test/searchers/posts_searcher_test.rb 2016-12-12 11:55:22 +0900 (46c72a3) @@ -4,27 +4,28 @@ class PostsSearcherTest < ActionController::TestCase include Groonga::Client::Rails::TestHelper setup do + Post.destroy_all @searcher = PostsSearcher.new end test "should be untagged" do - create(:post, body: "<p>Hello <em>World</em></p>") + Post.create!(title: "Title", body: "<p>Hello <em>World</em></p>") result_set =****@searc*****_set assert_equal(["Hello World"], result_set.records.collect {|record| record["body"]}) end test "should be searchable without match_columns" do - create(:post, body: "Hello World") - create(:post, body: "Hello Rails") + Post.create!(title: "Title", body: "Hello World") + Post.create!(title: "Title", body: "Hello Rails") result_set =****@searc*****("World").result_set assert_equal(["Hello World"], result_set.records.collect {|record| record["body"]}) end test "should be searchable by a filter" do - create(:post, body: "Hello World") - create(:post, body: "Hello Rails") + Post.create!(title: "Title", body: "Hello World") + Post.create!(title: "Title", body: "Hello Rails") result_set = @searcher. search. filter("body @ %{keyword}", {keyword: "World"}). @@ -34,9 +35,9 @@ class PostsSearcherTest < ActionController::TestCase end test "should be searchable by filters" do - create(:post, body: "Hello World") - create(:post, body: "Hello Rails") - create(:post, body: "Hi World") + Post.create!(title: "Title", body: "Hello World") + Post.create!(title: "Title", body: "Hello Rails") + Post.create!(title: "Title", body: "Hi World") result_set = @searcher. search. filter("body @ %{keyword}", {keyword: "Hello"}). @@ -47,8 +48,8 @@ class PostsSearcherTest < ActionController::TestCase end test "should be searchable with special characters by a filter" do - create(:post, body: "Hello \"Wo\\rld\"") - create(:post, body: "Hello Rails") + Post.create!(title: "Title", body: "Hello \"Wo\\rld\"") + Post.create!(title: "Title", body: "Hello Rails") result_set = @searcher. search. filter("body @ %{keyword}", {keyword: "\"Wo\\rld\""}). @@ -58,8 +59,8 @@ class PostsSearcherTest < ActionController::TestCase end test "should support snippet_html in output_columns" do - create(:post, body: "Hello World") - create(:post, body: "Hi Rails! Hello!") + Post.create!(title: "Title", body: "Hello World") + Post.create!(title: "Title", body: "Hi Rails! Hello!") result_set = @searcher. search. query("Hello"). @@ -76,7 +77,7 @@ class PostsSearcherTest < ActionController::TestCase end test "should support Array for output_columns" do - post = create(:post, body: "Hello World") + post = Post.create!(title: "Title", body: "Hello World") result_set = @searcher. search. query("World"). @@ -101,7 +102,7 @@ class PostsSearcherTest < ActionController::TestCase test "should support pagination" do 100.times do |i| - create(:post, body: "Hello #{i}") + Post.create!(title: "Title", body: "Hello #{i}") end result_set =****@searc*****(3, per_page: 5).result_set data = result_set.records.collect do |record| Modified: test/apps/rails5-activerecord/test/test_helper.rb (+3 -1) =================================================================== --- test/apps/rails5-activerecord/test/test_helper.rb 2016-12-12 11:54:52 +0900 (d2aca34) +++ test/apps/rails5-activerecord/test/test_helper.rb 2016-12-12 11:55:22 +0900 (abed6a8) @@ -4,6 +4,8 @@ require 'rails/test_help' require 'groonga/client/rails/test_helper' class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... - include FactoryGirl::Syntax::Methods end -------------- next part -------------- HTML����������������������������...다운로드
