diff --git a/app/assets/images/logo_large.png b/app/assets/images/logo_large.png index 9b919e3..3465067 100644 Binary files a/app/assets/images/logo_large.png and b/app/assets/images/logo_large.png differ diff --git a/app/assets/images/logo_large@2x.png b/app/assets/images/logo_large@2x.png index b7fc91d..d6d8b3c 100644 Binary files a/app/assets/images/logo_large@2x.png and b/app/assets/images/logo_large@2x.png differ diff --git a/app/assets/javascripts/learning_targets.js.coffee b/app/assets/javascripts/concepts.js.coffee similarity index 100% rename from app/assets/javascripts/learning_targets.js.coffee rename to app/assets/javascripts/concepts.js.coffee diff --git a/app/assets/stylesheets/learning_targets.css.scss b/app/assets/stylesheets/concepts.css.scss similarity index 100% rename from app/assets/stylesheets/learning_targets.css.scss rename to app/assets/stylesheets/concepts.css.scss diff --git a/app/assets/stylesheets/output.gif b/app/assets/stylesheets/output.gif index c9031b9..2f7efc1 100644 Binary files a/app/assets/stylesheets/output.gif and b/app/assets/stylesheets/output.gif differ diff --git a/app/assets/stylesheets/units.css.scss b/app/assets/stylesheets/units.css.scss index bf27037..f386119 100644 --- a/app/assets/stylesheets/units.css.scss +++ b/app/assets/stylesheets/units.css.scss @@ -2,6 +2,6 @@ // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ -.lt-heading{ +.concept-heading{ line-height: 200%; } \ No newline at end of file diff --git a/app/controllers/learning_targets_controller.rb b/app/controllers/concepts_controller.rb similarity index 53% rename from app/controllers/learning_targets_controller.rb rename to app/controllers/concepts_controller.rb index 6c29df5..7bda84c 100644 --- a/app/controllers/learning_targets_controller.rb +++ b/app/controllers/concepts_controller.rb @@ -1,44 +1,44 @@ -class LearningTargetsController < ApplicationController +class ConceptsController < ApplicationController def new - @lt = LearningTarget.new + @concept = Concept.new end def create - @lt = current_unit.learning_targets.build(lt_params) - if @lt.save + @concept = current_unit.concepts.build(concept_params) + if @concept.save redirect_to root_path end end def show - @lt = LearningTarget.find(params[:id]) + @concept = Concept.find(params[:id]) end - def lt_params - params.require(:learning_target).permit(:description) + def concept_params + params.require(:concept).permit(:description) end def new_progress enrollment = Enrollment.where("student_id = ? AND course_id = ?", - current_student.id, @lt.unit.course.id).first + current_student.id, @concept.unit.course.id).first progress = LearningTargetProgress.new(enrollment_id: enrollment.id, - learning_target_id: @lt.id) + concept_id: @concept.id) - redirect_to @lt if progress.save + redirect_to @concept if progress.save end def modify_level - @lt = LearningTarget.find(params[:lt_id]) + @concept = Concept.find(params[:concept_id]) if student_signed_in? enrollment = Enrollment.where("student_id = ? AND course_id = ?", - current_student.id, @lt.unit.course.id).first + current_student.id, @concept.unit.course.id).first - progress = LearningTargetProgress.where("learning_target_id = ? AND + progress = LearningTargetProgress.where("concept_id= ? AND enrollment_id = ?", - @lt.id,enrollment.id).first + @concept.id,enrollment.id).first comment = Comment.create(content: params[:comment], commenter_name: current_student.full_name) @@ -46,11 +46,11 @@ def modify_level elsif teacher_signed_in? enrollment = Enrollment.where("student_id = ? AND course_id = ?", - params[:student_id], @lt.unit.course.id).first + params[:student_id], @concept.unit.course.id).first - progress = LearningTargetProgress.where("learning_target_id = ? AND + progress = LearningTargetProgress.where("concept_id= ? AND enrollment_id = ?", - @lt.id,enrollment.id).first + @concept.id,enrollment.id).first comment = Comment.create(content: params[:comment], commenter_name: current_teacher.full_name) @@ -59,7 +59,7 @@ def modify_level progress.add_comment(comment) progress.change_level(params[:level]) - redirect_to @lt if progress.save + redirect_to @concept if progress.save end helper_method :new_progress diff --git a/app/controllers/units_controller.rb b/app/controllers/units_controller.rb index ec71846..e5ce179 100644 --- a/app/controllers/units_controller.rb +++ b/app/controllers/units_controller.rb @@ -8,10 +8,10 @@ def show @unit = Unit.find(params[:id]) end - def add_lt - @lt = LearningTarget.new(unit_id: params[:current_unit], description: params[:lt_desc], number: params[:lt_number]) + def add_concept + @concept = Concept.new(unit_id: params[:current_unit], description: params[:concept_desc], number: params[:concept_number]) - @lt.save + @concept.save redirect_to unit_path(params[:current_unit]) end diff --git a/app/helpers/concepts_helper.rb b/app/helpers/concepts_helper.rb new file mode 100644 index 0000000..80a4dd1 --- /dev/null +++ b/app/helpers/concepts_helper.rb @@ -0,0 +1,2 @@ +module ConceptsHelper +end diff --git a/app/helpers/learning_targets_helper.rb b/app/helpers/learning_targets_helper.rb deleted file mode 100644 index 0aab562..0000000 --- a/app/helpers/learning_targets_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module LearningTargetsHelper -end diff --git a/app/models/learning_target.rb b/app/models/concept.rb similarity index 80% rename from app/models/learning_target.rb rename to app/models/concept.rb index e1e7b88..d979f91 100644 --- a/app/models/learning_target.rb +++ b/app/models/concept.rb @@ -1,4 +1,4 @@ -class LearningTarget < ActiveRecord::Base +class Concept < ActiveRecord::Base belongs_to :unit has_many :learning_target_progresses, dependent: :destroy diff --git a/app/models/learning_target_progress.rb b/app/models/learning_target_progress.rb index dee4cb2..e35953a 100644 --- a/app/models/learning_target_progress.rb +++ b/app/models/learning_target_progress.rb @@ -5,7 +5,7 @@ class LearningTargetProgress < ActiveRecord::Base after_initialize :init belongs_to :enrollment - belongs_to :learning_target + belongs_to :concept has_many :comments validates_presence_of :level diff --git a/app/models/task.rb b/app/models/task.rb index e9d9d80..8f2affe 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -1,6 +1,6 @@ class Task < ActiveRecord::Base - belongs_to :learning_target + belongs_to :concept validates_presence_of :status, :content end diff --git a/app/models/unit.rb b/app/models/unit.rb index 20e66cc..c101a20 100644 --- a/app/models/unit.rb +++ b/app/models/unit.rb @@ -1,7 +1,7 @@ class Unit < ActiveRecord::Base belongs_to :course - has_many :learning_targets + has_many :concepts validates_presence_of :name, :number end diff --git a/app/views/learning_targets/_modify_level_form.html.erb b/app/views/concepts/_modify_level_form.html.erb similarity index 86% rename from app/views/learning_targets/_modify_level_form.html.erb rename to app/views/concepts/_modify_level_form.html.erb index 0295550..6fb1f73 100644 --- a/app/views/learning_targets/_modify_level_form.html.erb +++ b/app/views/concepts/_modify_level_form.html.erb @@ -1,4 +1,4 @@ -<%= form_tag learning_targets_modify_level_path, id:"levelForm", +<%= form_tag concepts_modify_level_path, id:"levelForm", method: 'post' do%>
@@ -10,7 +10,7 @@ <%= select_tag :level, options_for_select([1,2,3,4]), class: "form-control" %> - <%= hidden_field_tag 'lt_id', params[:id] %> + <%= hidden_field_tag 'concept_id', params[:id] %> <%= hidden_field_tag 'student_id', params[:student_id]%>
<%= button_tag "Change Level", @@ -30,4 +30,4 @@ $('#levelButton').click(function() { $('#levelForm').submit(); } }); - \ No newline at end of file + diff --git a/app/views/learning_targets/_modify_level_modal.html.erb b/app/views/concepts/_modify_level_modal.html.erb similarity index 100% rename from app/views/learning_targets/_modify_level_modal.html.erb rename to app/views/concepts/_modify_level_modal.html.erb diff --git a/app/views/learning_targets/_student.html.erb b/app/views/concepts/_student.html.erb similarity index 100% rename from app/views/learning_targets/_student.html.erb rename to app/views/concepts/_student.html.erb diff --git a/app/views/concepts/_student_progress.html.erb b/app/views/concepts/_student_progress.html.erb new file mode 100644 index 0000000..6b3b057 --- /dev/null +++ b/app/views/concepts/_student_progress.html.erb @@ -0,0 +1,21 @@ + + <% if current_student.current_progress(@concept.unit.course).nil? %> + <% new_progress %> + <% else %> + <%= current_student.current_progress(@concept.unit.course).level%> + + <%= current_student.current_progress(@concept.unit.course).comments.last.content if !current_student.current_progress(@concept.unit.course).comments.last.nil? %> + + + <%= current_student.current_progress(@concept.unit.course). + comments.last.commenter_name if !current_student.current_progress( + @concept.unit.course).comments.last.nil? %> + + <% end %> + + <%= link_to "Change Level", '#levelModal', + :class => "btn btn-primary btn-sm changebutton", + :data => { :toggle => "modal" }, + :id => current_student.id %> + + \ No newline at end of file diff --git a/app/views/learning_targets/_teacher.html.erb b/app/views/concepts/_teacher.html.erb similarity index 87% rename from app/views/learning_targets/_teacher.html.erb rename to app/views/concepts/_teacher.html.erb index ca090eb..ae8ddc3 100644 --- a/app/views/learning_targets/_teacher.html.erb +++ b/app/views/concepts/_teacher.html.erb @@ -6,7 +6,7 @@ Commented By Level Up? - <% if @lt.unit.course.enrollments.empty? %> + <% if @concept.unit.course.enrollments.empty? %>
There are currently no students enrolled. diff --git a/app/views/learning_targets/_teacher_progress.html.erb b/app/views/concepts/_teacher_progress.html.erb similarity index 91% rename from app/views/learning_targets/_teacher_progress.html.erb rename to app/views/concepts/_teacher_progress.html.erb index ff51b70..0ac20f5 100644 --- a/app/views/learning_targets/_teacher_progress.html.erb +++ b/app/views/concepts/_teacher_progress.html.erb @@ -1,4 +1,4 @@ -<% @lt.unit.course.enrollments.each do |e| %> +<% @concept.unit.course.enrollments.each do |e| %> <% e.learning_target_progresses.each do |p| %> > <%= e.student.full_name %> diff --git a/app/views/learning_targets/show.html.erb b/app/views/concepts/show.html.erb similarity index 53% rename from app/views/learning_targets/show.html.erb rename to app/views/concepts/show.html.erb index d58380b..ae510dc 100644 --- a/app/views/learning_targets/show.html.erb +++ b/app/views/concepts/show.html.erb @@ -1,11 +1,11 @@ -<% provide(:title, "LT #{ @lt.number }") %> +<% provide(:title, "Concept #{ @concept.number }") %> <%= render 'modify_level_modal' %>
-

<%= "Learning Target #{ @lt.number }" %>

-
<%= @lt.description %>
+

<%= "Concept #{ @concept.number }" %>

+
<%= @concept.description %>
diff --git a/app/views/learning_targets/_student_progress.html.erb b/app/views/learning_targets/_student_progress.html.erb deleted file mode 100644 index 0e18555..0000000 --- a/app/views/learning_targets/_student_progress.html.erb +++ /dev/null @@ -1,21 +0,0 @@ - - <% if current_student.current_progress(@lt.unit.course).nil? %> - <% new_progress %> - <% else %> - <%= current_student.current_progress(@lt.unit.course).level%> - - <%= current_student.current_progress(@lt.unit.course).comments.last.content if !current_student.current_progress(@lt.unit.course).comments.last.nil? %> - - - <%= current_student.current_progress(@lt.unit.course). - comments.last.commenter_name if !current_student.current_progress( - @lt.unit.course).comments.last.nil? %> - - <% end %> - - <%= link_to "Change Level", '#levelModal', - :class => "btn btn-primary btn-sm changebutton", - :data => { :toggle => "modal" }, - :id => current_student.id %> - - \ No newline at end of file diff --git a/app/views/teachers/_concept_form.html.erb b/app/views/teachers/_concept_form.html.erb new file mode 100644 index 0000000..d1db5db --- /dev/null +++ b/app/views/teachers/_concept_form.html.erb @@ -0,0 +1,19 @@ +<%= form_tag units_add_concept_path, method: 'post' do %> +
+
+ <%= label_tag :concept_number %> + <%= text_field_tag :concept_number, nil, + class: "form-control", + placeholder: "Concept Number"%>
+ + <%= label_tag :concept_description %> + <%= text_area_tag :concept_desc, nil, + class: "form-control", + rows: "5", + placeholder: "Concept Description" %>
+ <%= hidden_field_tag :current_unit, @unit.id %> + +
+ <%= submit_tag "Add Concept", class: "btn btn-default" %> +
+<% end %> diff --git a/app/views/teachers/_lt_modal.html.erb b/app/views/teachers/_concept_modal.html.erb similarity index 64% rename from app/views/teachers/_lt_modal.html.erb rename to app/views/teachers/_concept_modal.html.erb index a6d9956..9fd1774 100644 --- a/app/views/teachers/_lt_modal.html.erb +++ b/app/views/teachers/_concept_modal.html.erb @@ -1,13 +1,13 @@ - diff --git a/app/views/teachers/_lt_form.html.erb b/app/views/teachers/_lt_form.html.erb deleted file mode 100644 index cc6eead..0000000 --- a/app/views/teachers/_lt_form.html.erb +++ /dev/null @@ -1,19 +0,0 @@ -<%= form_tag units_add_lt_path, method: 'post' do %> -
-
- <%= label_tag :learning_target_number %> - <%= text_field_tag :lt_number, nil, - class: "form-control", - placeholder: "Learning Target Number"%>
- - <%= label_tag :learning_target_description %> - <%= text_area_tag :lt_desc, nil, - class: "form-control", - rows: "5", - placeholder: "Learning Target Description" %>
- <%= hidden_field_tag :current_unit, @unit.id %> - -
- <%= submit_tag "Add Learning Target", class: "btn btn-default" %> -
-<% end %> diff --git a/app/views/units/_concept_list.html.erb b/app/views/units/_concept_list.html.erb new file mode 100644 index 0000000..69a044e --- /dev/null +++ b/app/views/units/_concept_list.html.erb @@ -0,0 +1,25 @@ +
+
Concepts + <% if teacher_signed_in? %> + + + + <% end %> +
+ + + + + + + <% @unit.concepts.each do |concept| %> + + + + + + <% end %> +
ConceptDescriptionView more
<%= concept.number %><%= concept.description %><%= link_to "View more", concept %>
+
diff --git a/app/views/units/_learning_target_list.html.erb b/app/views/units/_learning_target_list.html.erb deleted file mode 100644 index 4d0d0a7..0000000 --- a/app/views/units/_learning_target_list.html.erb +++ /dev/null @@ -1,23 +0,0 @@ -
-
Learning Targets - <% if teacher_signed_in? %> - - - - <% end %> -
- - - - - - - <% @unit.learning_targets.each do |lt| %> - - - - - - <% end %> -
LTDescriptionView more
<%= lt.number %><%= lt.description %><%= link_to "View more", lt %>
-
diff --git a/app/views/units/_student_view.html.erb b/app/views/units/_student_view.html.erb index 5702a2b..63d02b8 100644 --- a/app/views/units/_student_view.html.erb +++ b/app/views/units/_student_view.html.erb @@ -1 +1 @@ -<%= render 'learning_target_list' %> +<%= render 'concept_list' %> diff --git a/app/views/units/_teacher_view.html.erb b/app/views/units/_teacher_view.html.erb index 3de2a3d..50b9e3c 100644 --- a/app/views/units/_teacher_view.html.erb +++ b/app/views/units/_teacher_view.html.erb @@ -1,15 +1,19 @@ -
- <% if @unit.learning_targets.first.nil? %> +
+ + <% if @unit.concepts.first.nil? %> +
- Would you like to add a learning target for <%= @unit.name %>? + Would you like to add a + concept for <%= @unit.name %>?
- - <% else %> - + + <% else %> +
- <%= render 'learning_target_list' %> + <%= render 'concept_list' %>
- - <% end %> + + <% end %> +
diff --git a/app/views/units/show.html.erb b/app/views/units/show.html.erb index 3e6b146..cdc74bb 100644 --- a/app/views/units/show.html.erb +++ b/app/views/units/show.html.erb @@ -1,6 +1,6 @@ <% provide(:title, @unit.name) %> -<%= render 'teachers/lt_modal' %> +<%= render 'teachers/concept_modal' %>

<%= "Unit #{ @unit.number } - #{ @unit.name }" %>

diff --git a/config/routes.rb b/config/routes.rb index 801853d..41bf68b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -14,9 +14,9 @@ resources :teachers, :students resources :courses, only: [:create, :destroy] resources :units, only: [:create, :show, :destroy] - resources :learning_targets, only: [:create, :destroy] + resources :concepts, only: [:create, :destroy] - resources :learning_targets do + resources :concepts do get 'level_up', :on => :member end @@ -38,8 +38,8 @@ get "/acknowledgements", to: "static_pages#acknowledgements" get "/sign_up", to: "static_pages#sign_up" - post 'students/add_course', to: 'students#add_course' - post 'teachers/add_unit', to: 'teachers#add_unit' - post 'units/add_lt', to: 'units#add_lt' - post 'learning_targets/modify_level', to: 'learning_targets#modify_level' + post 'students/add_course', to: 'students#add_course' + post 'teachers/add_unit', to: 'teachers#add_unit' + post 'units/add_concept', to: 'units#add_concept' + post 'concepts/modify_level', to: 'concepts#modify_level' end diff --git a/db/migrate/20131005094857_rename_learning_target_to_concept.rb b/db/migrate/20131005094857_rename_learning_target_to_concept.rb new file mode 100644 index 0000000..424ad7a --- /dev/null +++ b/db/migrate/20131005094857_rename_learning_target_to_concept.rb @@ -0,0 +1,5 @@ +class RenameLearningTargetToConcept < ActiveRecord::Migration + def change + rename_table :learning_targets, :concepts + end +end diff --git a/db/migrate/20131005095713_rename_learning_target_progress_column_learning_target_id_to_concept_id.rb b/db/migrate/20131005095713_rename_learning_target_progress_column_learning_target_id_to_concept_id.rb new file mode 100644 index 0000000..78d7a29 --- /dev/null +++ b/db/migrate/20131005095713_rename_learning_target_progress_column_learning_target_id_to_concept_id.rb @@ -0,0 +1,5 @@ +class RenameLearningTargetProgressColumnLearningTargetIdToConceptId < ActiveRecord::Migration + def change + rename_column :learning_target_progresses, :learning_target_id, :concept_id + end +end diff --git a/db/migrate/20131005095933_rename_task_column_learning_target_id_to_concept_id.rb b/db/migrate/20131005095933_rename_task_column_learning_target_id_to_concept_id.rb new file mode 100644 index 0000000..ebbcc8b --- /dev/null +++ b/db/migrate/20131005095933_rename_task_column_learning_target_id_to_concept_id.rb @@ -0,0 +1,5 @@ +class RenameTaskColumnLearningTargetIdToConceptId < ActiveRecord::Migration + def change + rename_column :tasks, :learning_target_id, :concept_id + end +end diff --git a/db/schema.rb b/db/schema.rb index f04dab5..bf9cd3a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20130907010816) do +ActiveRecord::Schema.define(version: 20131005095933) do create_table "comments", force: true do |t| t.string "content" @@ -23,6 +23,15 @@ add_index "comments", ["created_at"], name: "index_comments_on_created_at" + create_table "concepts", force: true do |t| + t.integer "unit_id" + t.string "number" + t.text "description" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "learning_target_progress_id" + end + create_table "courses", force: true do |t| t.integer "teacher_id" t.string "name" @@ -42,19 +51,10 @@ t.datetime "created_at" t.datetime "updated_at" t.integer "enrollment_id" - t.integer "learning_target_id" + t.integer "concept_id" t.integer "level" end - create_table "learning_targets", force: true do |t| - t.integer "unit_id" - t.string "number" - t.text "description" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "learning_target_progress_id" - end - create_table "roles", force: true do |t| t.string "name" t.datetime "created_at" @@ -89,7 +89,7 @@ create_table "tasks", force: true do |t| t.string "status" t.string "content" - t.integer "learning_target_id" + t.integer "concept_id" t.datetime "created_at" t.datetime "updated_at" end diff --git a/spec/controllers/concepts_controller_spec.rb b/spec/controllers/concepts_controller_spec.rb new file mode 100644 index 0000000..db642d4 --- /dev/null +++ b/spec/controllers/concepts_controller_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe ConceptsController do + +end diff --git a/spec/controllers/learning_targets_controller_spec.rb b/spec/controllers/learning_targets_controller_spec.rb deleted file mode 100644 index a2e2f90..0000000 --- a/spec/controllers/learning_targets_controller_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'spec_helper' - -describe LearningTargetsController do - -end diff --git a/spec/factories.rb b/spec/factories.rb index daa4f6d..cc3601e 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -29,7 +29,7 @@ number "1.2" end - factory :learning_target do + factory :concept do number "1.1a" description "Ability to graph the sine function without a calculator." end @@ -42,13 +42,13 @@ factory :task do status "Incomplete" content "Do something." - learning_target + concept end factory :learning_target_progress do - learning_target_id 1 - enrollment_id 1 - level 1 + concept_id 1 + enrollment_id 1 + level 1 end factory :comment do diff --git a/spec/features/learning_target_show_spec.rb b/spec/features/learning_target_show_spec.rb index bd79a73..cb3bdf3 100644 --- a/spec/features/learning_target_show_spec.rb +++ b/spec/features/learning_target_show_spec.rb @@ -2,7 +2,7 @@ describe "LearningTarget detail view" do - before { @lt = FactoryGirl.create(:learning_target) } + before { @lt = FactoryGirl.create(:concept) } subject { page } @@ -10,9 +10,9 @@ before do - @teacher = add_learning_target(FactoryGirl.create(:teacher), @lt) + @teacher = add_concept(FactoryGirl.create(:teacher), @lt) sign_in @teacher - visit learning_target_path(@lt) + visit concept_path(@lt) end it { should have_content(@lt.number) } @@ -26,9 +26,9 @@ before do - @student = add_learning_target(FactoryGirl.create(:student), @lt) + @student = add_concept(FactoryGirl.create(:student), @lt) @student = add_lt_progress(@student) - visit learning_target_path(@lt) + visit concept_path(@lt) end it { should have_content @student.full_name } @@ -60,24 +60,24 @@ before do - @student = add_learning_target(FactoryGirl.create(:student), @lt) + @student = add_concept(FactoryGirl.create(:student), @lt) sign_in @student - visit learning_target_path(@lt) + visit concept_path(@lt) end it { should have_content(@lt.number) } end end -def add_learning_target(model, lt) +def add_concept(model, lt) model.courses << FactoryGirl.create(:course) model.courses.last.units << FactoryGirl.create(:unit) - model.courses.last.units.last.learning_targets << lt + model.courses.last.units.last.concepts << lt model end def add_lt_progress(model) - model.courses.last.units.last.learning_targets.last. + model.courses.last.units.last.concepts.last. learning_target_progresses << FactoryGirl.create(:learning_target_progress) model end diff --git a/spec/features/unit_show_spec.rb b/spec/features/unit_show_spec.rb index 374283d..901d614 100644 --- a/spec/features/unit_show_spec.rb +++ b/spec/features/unit_show_spec.rb @@ -4,10 +4,10 @@ before do - teacher = add_course_and_unit(FactoryGirl.create(:teacher)) - @unit = teacher.courses.last.units.last - @unit.learning_targets.create(number: "3.5", description: "2D Vectors") - @learning_target = @unit.learning_targets.last + @teacher = add_course_and_unit(FactoryGirl.create(:teacher)) + @unit = @teacher.courses.last.units.last + @unit.concepts.create(number: "3.5", description: "2D Vectors") + @concept = @unit.concepts.last visit unit_path(@unit) end @@ -27,6 +27,21 @@ describe "when logged in as a teacher" do + + before do + sign_in @teacher + visit unit_path(@unit) + end + + describe "and no concepts exist" do + + before do + @unit.concepts.delete_all + visit unit_path(@unit) + end + + it { should have_content("add a concept") } + end end describe "when logged in as a student" do @@ -37,12 +52,12 @@ visit unit_path(@unit) end - it "should list learning target numbers" do - should have_content(@learning_target.number) + it "should list concept numbers" do + should have_content(@concept.number) end - it "should list learning target descriptions" do - should have_content(@learning_target.description) + it "should list concept descriptions" do + should have_content(@concept.description) end end end diff --git a/spec/helpers/learning_targets_helper_spec.rb b/spec/helpers/concepts_helper_spec.rb similarity index 91% rename from spec/helpers/learning_targets_helper_spec.rb rename to spec/helpers/concepts_helper_spec.rb index ad625b3..d86c8fd 100644 --- a/spec/helpers/learning_targets_helper_spec.rb +++ b/spec/helpers/concepts_helper_spec.rb @@ -10,5 +10,5 @@ # end # end # end -describe LearningTargetsHelper do +describe ConceptsHelper do end diff --git a/spec/models/learning_target_spec.rb b/spec/models/concept_spec.rb similarity index 56% rename from spec/models/learning_target_spec.rb rename to spec/models/concept_spec.rb index cee35df..1868da9 100644 --- a/spec/models/learning_target_spec.rb +++ b/spec/models/concept_spec.rb @@ -1,51 +1,51 @@ require 'spec_helper' -describe "Learning targets" do +describe Concept do before do teacher = FactoryGirl.create(:teacher) course = FactoryGirl.create(:course) unit = FactoryGirl.create(:unit) - @learning_target = FactoryGirl.create(:learning_target) + @concept = FactoryGirl.create(:concept) teacher.courses << course course.units << unit - unit.learning_targets << @learning_target + unit.concepts << @concept end - subject { @learning_target } + subject { @concept } describe "attributes" do it { should belong_to :unit } - it { should have_many :learning_target_progresses } + it { should have_many :learning_target_progresses} it { should respond_to :description} it { should respond_to :number } end describe "when description is blank" do - before { @learning_target.description = "" } + before { @concept.description = "" } it { should_not be_valid } end describe "when number is blank" do - before { @learning_target.number = "" } + before { @concept.number = "" } it { should_not be_valid } end - describe "learning target relationships" do + describe "concept relationships" do - before { @learning_target.save } + before { @concept.save } - let!(:task1) { FactoryGirl.create(:task, learning_target: @learning_target) } - let!(:task2) { FactoryGirl.create(:task, content: "Do something else.", learning_target: @learning_target) } + let!(:task1) { FactoryGirl.create(:task, concept: @concept) } + let!(:task2) { FactoryGirl.create(:task, content: "Do something else.", concept: @concept) } it "should destroy associated tasks" do - tasks = @learning_target.tasks.to_a - @learning_target.destroy + tasks = @concept.tasks.to_a + @concept.destroy expect(tasks).not_to be_empty tasks.each do |task| expect(Task.where(id: task.id)).to be_empty diff --git a/spec/models/learning_target_progress_spec.rb b/spec/models/learning_target_progress_spec.rb index bacfcf5..8155349 100644 --- a/spec/models/learning_target_progress_spec.rb +++ b/spec/models/learning_target_progress_spec.rb @@ -8,11 +8,11 @@ describe "attributes" do - it { should respond_to :learning_target_id } + it { should respond_to :concept_id } it { should respond_to :level } it { should belong_to :enrollment } - it { should belong_to :learning_target } - it { should have_many :comments } + it { should belong_to :concept} + it { should have_many :comments } end describe "with no level" do diff --git a/spec/models/task_spec.rb b/spec/models/task_spec.rb index 514a225..1e7add1 100644 --- a/spec/models/task_spec.rb +++ b/spec/models/task_spec.rb @@ -5,15 +5,15 @@ teacher = FactoryGirl.create(:teacher) teacher.courses.build(name: "Algebra II") teacher.courses.first.units.build(name: "Basic Trig", number: "1.3.1") - teacher.courses.first.units.first.learning_targets.build(description: "Explain concept...", number: "1A") - @task = teacher.courses.first.units.first.learning_targets.first.tasks.build(status: "Incomplete", content: "Solve for...") + teacher.courses.first.units.first.concepts.build(description: "Explain concept...", number: "1A") + @task = teacher.courses.first.units.first.concepts.first.tasks.build(status: "Incomplete", content: "Solve for...") end subject { @task } describe "attributes" do - it { should belong_to :learning_target } + it { should belong_to :concept } it { should respond_to :status } it { should respond_to :content} end diff --git a/spec/models/unit_spec.rb b/spec/models/unit_spec.rb index 50ef519..f54b00e 100644 --- a/spec/models/unit_spec.rb +++ b/spec/models/unit_spec.rb @@ -15,7 +15,7 @@ describe "attributes" do it { should belong_to :course } - it { should have_many :learning_targets } + it { should have_many :concepts } it { should respond_to :name } it { should respond_to :number } end