From b5afff1c79458b78fabe0b1533b9db9a80a8fa01 Mon Sep 17 00:00:00 2001
From: Martin Lensment <mlensment@gmail.com>
Date: Tue, 15 Sep 2015 14:02:26 +0300
Subject: [PATCH] Fix tests #2713

---
 db/schema-read-only.rb                   | 1 -
 db/structure.sql                         | 3 ---
 spec/fabricators/registrar_fabricator.rb | 2 +-
 spec/fabricators/white_ip_fabricator.rb  | 4 ++--
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/db/schema-read-only.rb b/db/schema-read-only.rb
index 1903fb52f..0a9fea6ec 100644
--- a/db/schema-read-only.rb
+++ b/db/schema-read-only.rb
@@ -201,7 +201,6 @@ ActiveRecord::Schema.define(version: 20150915094707) do
     t.integer  "legacy_id"
     t.string   "statuses",           array: true
     t.hstore   "status_notes"
-    t.integer  "legacy_history_id"
     t.integer  "copy_from_id"
   end
 
diff --git a/db/structure.sql b/db/structure.sql
index 01c6e60cf..d08361887 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -597,7 +597,6 @@ CREATE TABLE contacts (
     legacy_id integer,
     statuses character varying[],
     status_notes hstore,
-    legacy_history_id integer,
     copy_from_id integer
 );
 
@@ -4930,8 +4929,6 @@ INSERT INTO schema_migrations (version) VALUES ('20150810114746');
 
 INSERT INTO schema_migrations (version) VALUES ('20150825125118');
 
-INSERT INTO schema_migrations (version) VALUES ('20150827151906');
-
 INSERT INTO schema_migrations (version) VALUES ('20150910113839');
 
 INSERT INTO schema_migrations (version) VALUES ('20150915094707');
diff --git a/spec/fabricators/registrar_fabricator.rb b/spec/fabricators/registrar_fabricator.rb
index c1f082083..bd801f642 100644
--- a/spec/fabricators/registrar_fabricator.rb
+++ b/spec/fabricators/registrar_fabricator.rb
@@ -9,7 +9,7 @@ Fabricator(:registrar) do
   country_code 'EE'
   code { sequence(:code) { |i| "REGISTRAR#{i}" } }
   reference_no { sequence(:reference_no) { |i| "RF#{i}" } }
-  white_ips { [Fabricate(:white_ip), Fabricate(:white_ip, interface: WhiteIp::REGISTRAR)] }
+  white_ips { [Fabricate(:white_ip), Fabricate(:white_ip, interfaces: [WhiteIp::REGISTRAR])] }
 end
 
 Fabricator(:registrar_with_no_account_activities, from: :registrar) do
diff --git a/spec/fabricators/white_ip_fabricator.rb b/spec/fabricators/white_ip_fabricator.rb
index 151cc6725..6eb574893 100644
--- a/spec/fabricators/white_ip_fabricator.rb
+++ b/spec/fabricators/white_ip_fabricator.rb
@@ -1,8 +1,8 @@
 Fabricator(:white_ip) do
   ipv4 '127.0.0.1'
-  interface WhiteIp::API
+  interfaces [WhiteIp::API]
 end
 
 Fabricator(:white_ip_registrar, from: :white_ip) do
-  interface WhiteIp::REGISTRAR
+  interfaces [WhiteIp::REGISTRAR]
 end