Merge 0915a3c into 1514ab4

.travis.yml

@@ -6,6 +6,8 @@ rvm:
 services:
   - mysql
 sudo: required
+env:
+  - COVERALLS_PARALLEL=true
 before_install:
   - curl --silent --location https://github.com/groonga/groonga/raw/master/data/travis/setup.sh | sh
   - sudo apt-get install -y -V mysql-server-mroonga

db/migrate/20161128185000_add_indices_to_covnersation_messages.rb

@@ -8,15 +8,5 @@ def change
     add_index :conversation_messages, [:id, :timestamp]
 
     add_index :conversation_messages, :message, type: :fulltext
-
-    reversible do |dir|
-      dir.up do
-        execute('ALTER TABLE conversation_messages DISABLE KEYS')
-        execute('ALTER TABLE conversation_messages ENABLE KEYS')
-      end
-
-      dir.down do
-      end
-    end
   end
 end

db/migrate/20161203143601_add_index_for_type_to_conversation_messages.rb

@@ -1,15 +1,5 @@
 class AddIndexForTypeToConversationMessages < ActiveRecord::Migration
   def change
     add_index :conversation_messages, :type
-
-    reversible do |dir|
-      dir.up do
-        execute('ALTER TABLE conversation_messages DISABLE KEYS')
-        execute('ALTER TABLE conversation_messages ENABLE KEYS')
-      end
-
-      dir.down do
-      end
-    end
   end
 end

db/migrate/20170403224903_add_indices_to_conversation_messages.rb

@@ -1,25 +1,9 @@
 class AddIndicesToConversationMessages < ActiveRecord::Migration
-  reversible do |dir|
-    dir.up do
-      remove_index :conversation_messages, column: :nick
+  def change
+    remove_index :conversation_messages, column: :nick
 
-      add_index :conversation_messages, :nick, type: :fulltext
-      add_index :conversation_messages, [:nick, :message], type: :fulltext
-      add_index :conversation_messages, [:channel_id, :timestamp]
-
-      execute('ALTER TABLE conversation_messages DISABLE KEYS')
-      execute('ALTER TABLE conversation_messages ENABLE KEYS')
-    end
-
-    dir.down do
-      add_index :conversation_messages, :nick
-
-      remove_index :conversation_messages, column: :nick
-      remove_index :conversation_messages, column: [:nick, :message]
-      remove_index :conversation_messages, column: [:channel_id, :timestamp]
-
-      execute('ALTER TABLE conversation_messages DISABLE KEYS')
-      execute('ALTER TABLE conversation_messages ENABLE KEYS')
-    end
+    add_index :conversation_messages, :nick, type: :fulltext
+    add_index :conversation_messages, [:nick, :message], type: :fulltext
+    add_index :conversation_messages, [:channel_id, :timestamp]
   end
 end

test/integration/channels_edit_test.rb

@@ -4,9 +4,15 @@ class ChannelsEditTest < ActionDispatch::IntegrationTest
   setup do
     @setting = create(:setting)
     @user = create(:user)
+
+    Channel.delete_all
     @channel = create(:channel)
   end
 
+  teardown do
+    Channel.delete_all
+  end
+
   test 'ログインしている場合、表示される' do
     login_user(@user)
 

test/integration/channels_index_test.rb

@@ -4,9 +4,15 @@ class ChannelsIndexTest < ActionDispatch::IntegrationTest
   setup do
     @setting = create(:setting)
     @user = create(:user)
+
+    Channel.delete_all
     @channel = create(:channel)
   end
 
+  teardown do
+    Channel.delete_all
+  end
+
   test '表示される' do
     get(channels_path)
     assert_response(:success)

test/integration/channels_show_test.rb

@@ -4,9 +4,15 @@ class ChannelsShowTest < ActionDispatch::IntegrationTest
   setup do
     @setting = create(:setting)
     @user = create(:user)
+
+    Channel.delete_all
     @channel = create(:channel)
   end
 
+  teardown do
+    Channel.delete_all
+  end
+
   test '表示される' do
     get(channel_path(@channel))
     assert_response(:success)

test/integration/channels_update_test.rb

@@ -9,6 +9,10 @@ class ChannelsUpdateTest < ActionDispatch::IntegrationTest
     @channel = create(:channel)
   end
 
+  teardown do
+    Channel.delete_all
+  end
+
   test 'ログインしていない場合、ログインページにリダイレクトされる' do
     logout_user