spec/support/sqlite_seed.rb in bullet-5.7.0 vs spec/support/sqlite_seed.rb in bullet-5.7.1

- old
+ new

@@ -1,102 +1,102 @@ module Support module SqliteSeed def seed_db - newspaper1 = Newspaper.create(:name => 'First Newspaper') - newspaper2 = Newspaper.create(:name => 'Second Newspaper') + newspaper1 = Newspaper.create(name: 'First Newspaper') + newspaper2 = Newspaper.create(name: 'Second Newspaper') - writer1 = Writer.create(:name => 'first', :newspaper => newspaper1) - writer2 = Writer.create(:name => 'second', :newspaper => newspaper2) - user1 = BaseUser.create(:name => 'third', :newspaper => newspaper1) - user2 = BaseUser.create(:name => 'fourth', :newspaper => newspaper2) + writer1 = Writer.create(name: 'first', newspaper: newspaper1) + writer2 = Writer.create(name: 'second', newspaper: newspaper2) + user1 = BaseUser.create(name: 'third', newspaper: newspaper1) + user2 = BaseUser.create(name: 'fourth', newspaper: newspaper2) - category1 = Category.create(:name => 'first') - category2 = Category.create(:name => 'second') + category1 = Category.create(name: 'first') + category2 = Category.create(name: 'second') - post1 = category1.posts.create(:name => 'first', :writer => writer1) - post1a = category1.posts.create(:name => 'like first', :writer => writer2, active: false) - post2 = category2.posts.create(:name => 'second', :writer => writer2) - post3 = category2.posts.create(:name => 'third', :writer => writer2) + post1 = category1.posts.create(name: 'first', writer: writer1) + post1a = category1.posts.create(name: 'like first', writer: writer2, active: false) + post2 = category2.posts.create(name: 'second', writer: writer2) + post3 = category2.posts.create(name: 'third', writer: writer2) - comment1 = post1.comments.create(:name => 'first', :author => writer1) - comment2 = post1.comments.create(:name => 'first2', :author => writer1) - comment3 = post1.comments.create(:name => 'first3', :author => writer1) - comment4 = post1.comments.create(:name => 'second', :author => writer2) - comment8 = post1a.comments.create(:name => 'like first 1', :author => writer1) - comment9 = post1a.comments.create(:name => 'like first 2', :author => writer2) - comment5 = post2.comments.create(:name => 'third', :author => user1) - comment6 = post2.comments.create(:name => 'fourth', :author => user2) - comment7 = post2.comments.create(:name => 'fourth', :author => writer1) + comment1 = post1.comments.create(name: 'first', author: writer1) + comment2 = post1.comments.create(name: 'first2', author: writer1) + comment3 = post1.comments.create(name: 'first3', author: writer1) + comment4 = post1.comments.create(name: 'second', author: writer2) + comment8 = post1a.comments.create(name: 'like first 1', author: writer1) + comment9 = post1a.comments.create(name: 'like first 2', author: writer2) + comment5 = post2.comments.create(name: 'third', author: user1) + comment6 = post2.comments.create(name: 'fourth', author: user2) + comment7 = post2.comments.create(name: 'fourth', author: writer1) - entry1 = category1.entries.create(:name => 'first') - entry2 = category1.entries.create(:name => 'second') + entry1 = category1.entries.create(name: 'first') + entry2 = category1.entries.create(name: 'second') - student1 = Student.create(:name => 'first') - student2 = Student.create(:name => 'second') - teacher1 = Teacher.create(:name => 'first') - teacher2 = Teacher.create(:name => 'second') + student1 = Student.create(name: 'first') + student2 = Student.create(name: 'second') + teacher1 = Teacher.create(name: 'first') + teacher2 = Teacher.create(name: 'second') student1.teachers = [teacher1, teacher2] student2.teachers = [teacher1, teacher2] teacher1.students << student1 teacher2.students << student2 - firm1 = Firm.create(:name => 'first') - firm2 = Firm.create(:name => 'second') - client1 = Client.create(:name => 'first') - client2 = Client.create(:name => 'second') + firm1 = Firm.create(name: 'first') + firm2 = Firm.create(name: 'second') + client1 = Client.create(name: 'first') + client2 = Client.create(name: 'second') firm1.clients = [client1, client2] firm2.clients = [client1, client2] client1.firms << firm1 client2.firms << firm2 - company1 = Company.create(:name => 'first') - company2 = Company.create(:name => 'second') + company1 = Company.create(name: 'first') + company2 = Company.create(name: 'second') - Address.create(:name => 'first', :company => company1) - Address.create(:name => 'second', :company => company2) + Address.create(name: 'first', company: company1) + Address.create(name: 'second', company: company2) - country1 = Country.create(:name => 'first') - country2 = Country.create(:name => 'second') + country1 = Country.create(name: 'first') + country2 = Country.create(name: 'second') - country1.cities.create(:name => 'first') - country1.cities.create(:name => 'second') - country2.cities.create(:name => 'third') - country2.cities.create(:name => 'fourth') + country1.cities.create(name: 'first') + country1.cities.create(name: 'second') + country2.cities.create(name: 'third') + country2.cities.create(name: 'fourth') - person1 = Person.create(:name => 'first') - person2 = Person.create(:name => 'second') + person1 = Person.create(name: 'first') + person2 = Person.create(name: 'second') - person1.pets.create(:name => 'first') - person1.pets.create(:name => 'second') - person2.pets.create(:name => 'third') - person2.pets.create(:name => 'fourth') + person1.pets.create(name: 'first') + person1.pets.create(name: 'second') + person2.pets.create(name: 'third') + person2.pets.create(name: 'fourth') - author1 = Author.create(:name => 'author1') - author2 = Author.create(:name => 'author2') - folder1 = Folder.create(:name => 'folder1', :author_id => author1.id) - folder2 = Folder.create(:name => 'folder2', :author_id => author2.id) - page1 = Page.create(:name => 'page1', :parent_id => folder1.id, :author_id => author1.id) - page2 = Page.create(:name => 'page2', :parent_id => folder1.id, :author_id => author1.id) - page3 = Page.create(:name => 'page3', :parent_id => folder2.id, :author_id => author2.id) - page4 = Page.create(:name => 'page4', :parent_id => folder2.id, :author_id => author2.id) + author1 = Author.create(name: 'author1') + author2 = Author.create(name: 'author2') + folder1 = Folder.create(name: 'folder1', author_id: author1.id) + folder2 = Folder.create(name: 'folder2', author_id: author2.id) + page1 = Page.create(name: 'page1', parent_id: folder1.id, author_id: author1.id) + page2 = Page.create(name: 'page2', parent_id: folder1.id, author_id: author1.id) + page3 = Page.create(name: 'page3', parent_id: folder2.id, author_id: author2.id) + page4 = Page.create(name: 'page4', parent_id: folder2.id, author_id: author2.id) - user1 = User.create(:name => 'user1', :category => category1) - user2 = User.create(:name => 'user2', :category => category1) + user1 = User.create(name: 'user1', category: category1) + user2 = User.create(name: 'user2', category: category1) - submission1 = user1.create_submission(:name => 'submission1') - submission2 = user2.create_submission(:name => 'submission2') + submission1 = user1.create_submission(name: 'submission1') + submission2 = user2.create_submission(name: 'submission2') - submission1.replies.create(:name => 'reply1') - submission1.replies.create(:name => 'reply2') - submission2.replies.create(:name => 'reply3') - submission2.replies.create(:name => 'reply4') + submission1.replies.create(name: 'reply1') + submission1.replies.create(name: 'reply2') + submission2.replies.create(name: 'reply3') + submission2.replies.create(name: 'reply4') end def setup_db - ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:') + ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:') - ActiveRecord::Schema.define(:version => 1) do + ActiveRecord::Schema.define(version: 1) do create_table :addresses do |t| t.column :name, :string t.column :company_id, :integer end @@ -192,11 +192,11 @@ create_table :posts do |t| t.column :name, :string t.column :category_id, :integer t.column :writer_id, :integer - t.column :active, :boolean, :default => true + t.column :active, :boolean, default: true end create_table :relationships do |t| t.column :firm_id, :integer t.column :client_id, :integer @@ -204,10 +204,10 @@ create_table :students do |t| t.column :name, :string end - create_table :students_teachers, :id => false do |t| + create_table :students_teachers, id: false do |t| t.column :student_id, :integer t.column :teacher_id, :integer end create_table :teachers do |t|