big refactor of windows models

spec/factories/chart_window.rb

@@ -1,10 +0,0 @@
-# Read about factories at http://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :chart_window do
-    channel_id 1
-    position 1
-    html "<iframe src=\"/\"/>"
-    col 0
-  end
-end

spec/factories/chart_window_details.rb

@@ -1,20 +0,0 @@
-# == Schema Information
-#
-# Table name: chart_window_details
-#
-#  id              :integer          not null, primary key
-#  chart_window_id :integer
-#  field_number    :integer
-#  created_at      :datetime
-#  updated_at      :datetime
-#  options         :string(255)
-#
-
-# Read about factories at http://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :chart_window_detail do
-    chart_window_id 1
-    field_number 1
-  end
-end

spec/factories/plugin_window.rb

@@ -1,11 +0,0 @@
-# Read about factories at http://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :plugin_window do
-    channel_id 1
-    position 1
-    html "<iframe ::OPTIONS::></iframe>"
-    
-    col 0
-  end
-end

spec/factories/plugin_window_details.rb

@@ -1,19 +0,0 @@
-# == Schema Information
-#
-# Table name: plugin_window_details
-#
-#  id               :integer          not null, primary key
-#  plugin_id        :integer
-#  plugin_window_id :integer
-#  created_at       :datetime
-#  updated_at       :datetime
-#
-
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :plugin_window_detail do
-    plugin_id 1
-    plugin_window_id 1
-  end
-end

spec/factories/portlet_window_details.rb

@@ -1,17 +0,0 @@
-# == Schema Information
-#
-# Table name: portlet_window_details
-#
-#  id                :integer          not null, primary key
-#  portlet_window_id :integer
-#  created_at        :datetime
-#  updated_at        :datetime
-#
-
-# Read about factories at http://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :portlet_window_detail do
-    portlet_window_id 1
-  end
-end

spec/factories/windows.rb

@@ -10,11 +10,12 @@
 #  html         :text
 #  col          :integer
 #  title        :string(255)
-#  wtype        :string(255)
+#  window_type  :string(255)
 #  name         :string(255)
-#  type         :string(255)
 #  private_flag :boolean          default(FALSE)
 #  show_flag    :boolean          default(TRUE)
+#  content_id   :integer
+#  options      :text
 #
 
 # Read about factories at http://github.com/thoughtbot/factory_girl
@@ -25,5 +26,7 @@ FactoryGirl.define do
     position 1
     html "<iframe ::OPTIONS::></iframe>"
     col 0
+    content_id 1
   end
 end
+