From ff65128b8bbcf5b7c4dcda2d7d74b455f628e647 Mon Sep 17 00:00:00 2001
From: Aaron Wiggins <apw7177@gmail.com>
Date: Mon, 3 Aug 2015 11:55:35 -0400
Subject: [PATCH] try to get tests passing

---
 app/models/experiment.rb                        |  4 ++--
 app/views/materials/index.html.erb              |  0
 test/controllers/concepts_controller_test.rb    |  4 ++++
 test/controllers/experiments_controller_test.rb | 16 +++++++++++++---
 test/controllers/materials_controller_test.rb   |  2 +-
 test/fixtures/experiments.yml                   | 11 +++++++----
 6 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 app/views/materials/index.html.erb

diff --git a/app/models/experiment.rb b/app/models/experiment.rb
index aa110e0..4b78e74 100644
--- a/app/models/experiment.rb
+++ b/app/models/experiment.rb
@@ -7,7 +7,6 @@ class Experiment < ActiveRecord::Base
   has_attached_file :uploaded_file
 
   validates_attachment_content_type :uploaded_file, :content_type => ['image/jpeg', 'image/png', 'image/pdf']
-  # validates :uploaded_file, presence: true
 
   has_many :comments, as: :commentable
 
@@ -24,7 +23,8 @@ class Experiment < ActiveRecord::Base
       reject_if: :all_blank,
       allow_destroy: true
 
-  validates :description, :complete_time, :name, presence: true
+  validates :description, :complete_time, :name, :age, presence: true
+
   validates_format_of :youtube_link,
       :allow_blank => true,
       :with => /\A(?:https?:\/\/)?(?:www\.)?youtu(?:\.be|be\.com)\/(?:watch\?v=)?([\w-]{10,})\z/,
diff --git a/app/views/materials/index.html.erb b/app/views/materials/index.html.erb
new file mode 100644
index 0000000..e69de29
diff --git a/test/controllers/concepts_controller_test.rb b/test/controllers/concepts_controller_test.rb
index 6aaa387..2830ded 100644
--- a/test/controllers/concepts_controller_test.rb
+++ b/test/controllers/concepts_controller_test.rb
@@ -1,6 +1,10 @@
 require 'test_helper'
 
 class ConceptsControllerTest < ActionController::TestCase
+  setup do
+    sign_in users(:one)
+  end
+  
   test "should get index" do
     get :index
     assert_response :success
diff --git a/test/controllers/experiments_controller_test.rb b/test/controllers/experiments_controller_test.rb
index 43b01c6..11b0579 100644
--- a/test/controllers/experiments_controller_test.rb
+++ b/test/controllers/experiments_controller_test.rb
@@ -3,8 +3,11 @@
 class ExperimentsControllerTest < ActionController::TestCase
   setup do
     sign_in users(:one)
+    @user = users(:one)
     @experiment = experiments(:one)
     @experiments = Experiment.all
+    @material = materials(:one)
+    @instruction = instructions(:one)
   end
 
   test "should get index" do
@@ -20,7 +23,12 @@ class ExperimentsControllerTest < ActionController::TestCase
 
   test "should create experiment" do
     assert_difference('Experiment.count') do
-      post :create, experiment: { id: @experiment, complete_time: @experiment.complete_time, description: @experiment.description, user_id: @experiment.user_id, youtube_link: @experiment.youtube_link }
+      post :create, experiment: { name: @experiment.name, complete_time: @experiment.complete_time,
+          description: @experiment.description, age: @experiment.age, user_id: @experiment.user_id,
+        materials_attributes: {"0" => { experiment_id: @experiment.id, item: @material.item } },
+        instructions_attributes: {"0" => { experiment_id: @experiment.id, information: @instruction.information,
+            order_number: @instruction.order_number } }
+          }
     end
 
     assert_redirected_to experiment_path(assigns(:experiment))
@@ -37,8 +45,10 @@ class ExperimentsControllerTest < ActionController::TestCase
   end
 
   test "should update experiment" do
-    patch :update, id: @experiment, experiment: { complete_time: @experiment.complete_time, description: @experiment.description, user_id: @experiment.user_id, youtube_link: @experiment.youtube_link }
-    assert_redirected_to experiment_path(assigns(:experiment))
+    patch :update, id: @experiment, experiment: { complete_time: @experiment.complete_time,
+        description: @experiment.description, user_id: @experiment.user_id,
+        youtube_link: @experiment.youtube_link }
+    assert_redirected_to experiment_path(asigns(:experiment))
   end
 
   test "should destroy experiment" do
diff --git a/test/controllers/materials_controller_test.rb b/test/controllers/materials_controller_test.rb
index 20cdb75..19fe26f 100644
--- a/test/controllers/materials_controller_test.rb
+++ b/test/controllers/materials_controller_test.rb
@@ -8,7 +8,7 @@ class MaterialsControllerTest < ActionController::TestCase
   end
 
   test "should get index" do
-    get :index
+    get :index, experiment_id: @experiment
     assert_response :success
     assert_not_nil assigns(:materials)
   end
diff --git a/test/fixtures/experiments.yml b/test/fixtures/experiments.yml
index ef41daa..766f963 100644
--- a/test/fixtures/experiments.yml
+++ b/test/fixtures/experiments.yml
@@ -3,11 +3,14 @@
 one:
   user_id: 1
   description: MyText
-  youtube_link: MyText
-  complete_time: 1.5
+  complete_time: 1
+  age: 1
+  uploaded_file_file_name: "image.jpg"
+  user: :one
 
 two:
   user_id: 1
   description: MyText
-  youtube_link: MyText
-  complete_time: 1.5
+  complete_time: 1
+  age: 2
+  uploaded_file_file_name: "image.jpg"