update with changes from Production branch

spec/factories/api_key.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :api_key do
+    api_key "0S5G2O7FAB5K0J6Z"
+    write_flag true
+  end
+end

spec/factories/channel.rb

@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :channel do
+    name "Channel name"
+    user_id 1
+    last_entry_id 1
+    video_type "youtube"
+    video_id = "123345"
+    # association :user
+  end
+end
+

spec/factories/chart_window.rb

@@ -0,0 +1,10 @@
+# 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

@@ -0,0 +1,20 @@
+# == 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/feed.rb

@@ -0,0 +1,12 @@
+FactoryGirl.define do
+  factory :feed do
+    field1 "foo"
+    field2 "10"
+    entry_id 1
+    latitude "51.477222"
+    longitude "0.0"
+    created_at (Time.now - 20.minutes)
+    updated_at (Time.now - 20.minutes)
+    sequence(:status) {|n| "foo#{n}" }
+  end
+end

spec/factories/plugin.rb

@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :plugin do
+    name "Plugin Name"
+    user_id 1
+    html = "<html/>"
+    css = "<style/>"
+    js = "<script/>"
+    private_flag = true
+    # association :user
+  end
+end

spec/factories/plugin_window.rb

@@ -0,0 +1,11 @@
+# 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

@@ -0,0 +1,19 @@
+# == 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

@@ -0,0 +1,17 @@
+# == 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/tag.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :tag do
+    name "Tag name"
+  end
+end

spec/factories/user.rb

@@ -0,0 +1,13 @@
+FactoryGirl.define do
+  factory :user do
+    sequence(:login) {|n| "name#{n}" }
+    sequence(:email) {|n| "email#{n}@example.com" }
+    password "foobar"
+    password_confirmation {|u| u.password}
+    bio ""
+    website ""
+    time_zone "London"
+    api_key 'ED1HVHNEH2BZD0AB'
+  end
+end
+

spec/factories/user_sessions.rb

@@ -0,0 +1,4 @@
+FactoryGirl.define do
+  factory :user_session do
+  end
+end

spec/factories/windows.rb

@@ -0,0 +1,29 @@
+# == Schema Information
+#
+# Table name: windows
+#
+#  id           :integer          not null, primary key
+#  channel_id   :integer
+#  position     :integer
+#  created_at   :datetime
+#  updated_at   :datetime
+#  html         :text
+#  col          :integer
+#  title        :string(255)
+#  wtype        :string(255)
+#  name         :string(255)
+#  type         :string(255)
+#  private_flag :boolean          default(FALSE)
+#  show_flag    :boolean          default(TRUE)
+#
+
+# Read about factories at http://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :window do
+    channel_id 1
+    position 1
+    html "<iframe ::OPTIONS::></iframe>"
+    col 0
+  end
+end