gaku 0.0.1 → 0.0.2

data/core/spec/requests/class_groups/semester_class_groups_spec.rb

@@ -70,7 +70,7 @@ describe 'ClassGroup Semesters' do
 
     context 'edit', js: true do
       before do
-        within(table) { click edit_link }
+        within(table) { click js_edit_link }
         wait_until_visible modal
       end
 

data/core/spec/requests/course_groups/course_groups_spec.rb

@@ -44,7 +44,7 @@ describe 'CourseGroups' do
 
     context '#edit', js: true do
       before do
-        click edit_link
+        click js_edit_link
         wait_until_visible submit
       end
 

data/core/spec/requests/courses/courses_spec.rb

@@ -79,7 +79,7 @@ describe 'Courses' do
 
     context ' #edit ' do
       before do
-        click edit_link
+        click js_edit_link
         page.should have_content('Edit Course')
       end
 

data/core/spec/requests/courses/notes_spec.rb

@@ -3,18 +3,15 @@ require 'spec_helper'
 describe 'Course Notes' do
 
   before { as :admin }
+  before(:all) { set_resource 'course-note' }
 
   let(:course) { create(:course) }
-  let(:note) { create(:note, notable: course) }
-
-  before :all do
-    set_resource 'course-note'
-  end
+  let(:course_with_note) { create(:course, :with_note) }
 
   context 'new', js: true, type: 'note'  do
     before do
-      visit gaku.course_path(course)
-      @data = course
+      @resource = course
+      visit gaku.course_path(@resource)
     end
 
     it_behaves_like 'new note'
@@ -22,13 +19,11 @@ describe 'Course Notes' do
 
   context 'existing', js: true, type: 'note'  do
     before do
-      note
-      visit gaku.course_path(course)
-      @data = course
+      @resource = course_with_note
+      visit gaku.course_path(@resource)
     end
 
     it_behaves_like 'edit note'
-
     it_behaves_like 'delete note'
   end
 

data/core/spec/requests/courses/semester_courses_spec.rb

@@ -71,7 +71,7 @@ describe 'Course Semesters' do
 
     context 'edit', js: true do
       before do
-        within(table) { click edit_link }
+        within(table) { click js_edit_link }
         wait_until_visible modal
       end
 

data/core/spec/requests/exams/exam_portions/attachments_spec.rb

@@ -55,7 +55,7 @@ describe 'Exam Portion Attachments' do
 
     context '#edit' do
       before do
-        within(table) { click edit_link }
+        within(table) { click js_edit_link }
       end
 
       xit 'edits' do

data/core/spec/requests/exams/notes_spec.rb

@@ -3,18 +3,15 @@ require 'spec_helper'
 describe 'Exam Notes' do
 
   before { as :admin }
+  before(:all) { set_resource 'exam-note' }
 
   let(:exam) { create(:exam) }
-  let(:note) { create(:note, notable: exam) }
-
-  before :all do
-    set_resource 'exam-note'
-  end
+  let(:exam_with_note) { create(:exam, :with_note) }
 
   context 'new', js: true, type: 'note'  do
     before do
-      visit gaku.exam_path(exam)
-      @data = exam
+      @resource = exam
+      visit gaku.exam_path(@resource)
     end
 
     it_behaves_like 'new note'
@@ -22,13 +19,11 @@ describe 'Exam Notes' do
 
   context 'existing', js: true, type: 'note'  do
     before do
-      note
-      visit gaku.exam_path(exam)
-      @data = exam
+      @resource = exam_with_note
+      visit gaku.exam_path(@resource)
     end
 
     it_behaves_like 'edit note'
-
     it_behaves_like 'delete note'
   end
 

data/core/spec/requests/students/achievements_spec.rb

@@ -51,7 +51,7 @@ describe 'Student Achievements' do
 
     context '#edit' do
       before do
-        within(table) { click edit_link }
+        within(table) { click js_edit_link }
       end
 
       it 'edits' do

data/core/spec/requests/students/contacts_spec.rb

@@ -14,8 +14,8 @@ describe 'Student Contacts' do
   context 'new', js: true, type: 'contact' do
 
     before do
-      @data = student
-      visit gaku.edit_student_path(@data)
+      @resource = student
+      visit gaku.edit_student_path(@resource)
       click tab_link
       wait_until { has_content? 'Contacts list' }
     end
@@ -28,18 +28,18 @@ describe 'Student Contacts' do
 
     context 'one contact' do
 
-      before { @data = student_with_contact }
+      before { @resource = student_with_contact }
 
       context 'edit', js: true do
 
         before do
-          visit gaku.edit_student_path(@data)
+          visit gaku.edit_student_path(@resource)
           click tab_link
           wait_until { has_content? 'Contacts list' }
         end
 
         it_behaves_like 'edit contact'
-        it_behaves_like 'delete contact', @data
+        it_behaves_like 'delete contact', @resource
       end
 
     end
@@ -47,8 +47,8 @@ describe 'Student Contacts' do
     context 'two contacts', type: 'contact' do
 
       before do
-        @data = student_with_contacts
-        visit gaku.edit_student_path(@data)
+        @resource = student_with_contacts
+        visit gaku.edit_student_path(@resource)
         click tab_link
         wait_until { has_content? 'Contacts list' }
       end

data/core/spec/requests/students/guardians/contacts_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe 'Student Guardian Contacts' do
 
   before { as :admin }
+  before(:all) { set_resource 'student-guardian-contact' }
 
   let(:student) { create(:student) }
   let(:guardian) { create(:guardian) }
@@ -12,17 +13,12 @@ describe 'Student Guardian Contacts' do
 
   tab_link = '#student-guardian-contacts-tab-link'
 
-  before :all do
-    set_resource 'student-guardian-contact'
-  end
-
-
   context 'new', js: true, type: 'contact'  do
     before(:each) do
       contact_type
       student.guardians << guardian
       visit gaku.edit_student_path(student)
-      @data = guardian
+      @resource = guardian
       click '#student-guardians-tab-link'
       wait_until { page.has_content? 'Guardians list' }
       click edit_link
@@ -36,27 +32,23 @@ describe 'Student Guardian Contacts' do
   context 'existing', js: true, type: 'contact' do
 
     context 'one contact' do
-
       before do
-        @data = guardian_with_contact
-        student.guardians << @data
-        visit gaku.edit_student_guardian_path(student, @data)
+        @resource = guardian_with_contact
+        student.guardians << @resource
+        visit gaku.edit_student_guardian_path(student, @resource)
         click tab_link
       end
 
-
       it_behaves_like 'edit contact'
-
-      it_behaves_like 'delete contact', @data
-
+      it_behaves_like 'delete contact', @resource
     end
 
     context 'two contacts', type: 'contact' do
 
       before do
-        @data = guardian_with_contacts
-        student.guardians << @data
-        visit gaku.edit_student_guardian_path(student, @data)
+        @resource = guardian_with_contacts
+        student.guardians << @resource
+        visit gaku.edit_student_guardian_path(student, @resource)
         click tab_link
       end
 

data/core/spec/requests/students/notes_spec.rb

@@ -3,19 +3,16 @@ require 'spec_helper'
 describe 'Student Notes' do
 
   before { as :admin }
+  before(:all) { set_resource 'student-note' }
 
   let(:student) { create(:student) }
   let(:student_with_note) { create(:student, :with_note) }
   let(:note) { create(:note, notable: student) }
 
-  before :all do
-    set_resource 'student-note'
-  end
-
   context 'new', type: 'note'  do
     before do
-      @data = student
-      visit gaku.edit_student_path(@data)
+      @resource = student
+      visit gaku.edit_student_path(@resource)
       click tab_link
     end
 
@@ -24,13 +21,12 @@ describe 'Student Notes' do
 
   context 'existing', js: true, type: 'note'  do
     before do
-      @data = student_with_note
-      visit gaku.edit_student_path(@data)
+      @resource = student_with_note
+      visit gaku.edit_student_path(@resource)
       click tab_link
     end
 
     it_behaves_like 'edit note'
-
     it_behaves_like 'delete note'
   end
 

data/core/spec/requests/students/simple_grades_spec.rb

@@ -50,7 +50,7 @@ describe 'Student Simple Grades' do
 
     context '#edit' do
       before do
-        within(table) { click edit_link }
+        within(table) { click js_edit_link }
       end
 
       it 'edits' do

data/core/spec/requests/students/specialties_spec.rb

@@ -54,7 +54,7 @@ describe 'Student Specialties' do
 
     context '#edit' do
       before do
-        within(table) { click edit_link }
+        within(table) { click js_edit_link }
       end
 
       it 'edits' do

data/core/spec/requests/syllabuses/exams_spec.rb

@@ -24,7 +24,7 @@ describe 'Syllabus Exams' do
       syllabus
       visit gaku.syllabuses_path
 
-      within('#syllabuses-index tbody tr:nth-child(1)') { click show_link }
+      within('#syllabuses-index tbody tr:nth-child(1)') { click edit_link }
       page.should have_content 'No Exams'
     end
 
@@ -58,7 +58,7 @@ describe 'Syllabus Exams' do
       before do
         syllabus
         visit gaku.syllabuses_path
-        within('#syllabuses-index tbody tr:nth-child(1)') { click show_link }
+        within('#syllabuses-index tbody tr:nth-child(1)') { click edit_link }
         page.should have_content 'No Exams'
         click new_link
         wait_until_visible submit
@@ -95,11 +95,11 @@ describe 'Syllabus Exams' do
     context 'created exam' do
       before do
         syllabus.exams << exam
-        visit gaku.syllabus_path(syllabus)
+        visit gaku.edit_syllabus_path(syllabus)
       end
 
       it 'edits', js: true do
-        click edit_link
+        click js_edit_link
         wait_until_visible modal
 
         fill_in 'exam_name', with: 'Ruby Exam'
@@ -137,7 +137,7 @@ describe 'Syllabus Exams' do
     before do
       syllabus
       visit gaku.syllabuses_path
-      within('#syllabuses-index tbody tr:nth-child(1)') { click show_link }
+      within('#syllabuses-index tbody tr:nth-child(1)') { click edit_link }
     end
 
     it 'clicking on new-existing-exam-link hides new-exam form', js: true do

data/core/spec/requests/syllabuses/notes_spec.rb

@@ -3,19 +3,15 @@ require 'spec_helper'
 describe 'Syllabus Notes' do
 
   before { as :admin }
+  before(:all) { set_resource 'syllabus-note' }
 
   let(:syllabus) { create(:syllabus) }
   let(:syllabus_with_note) { create(:syllabus, :with_note) }
-  let(:note) { create(:note) }
-
-  before :all do
-    set_resource 'syllabus-note'
-  end
 
   context 'new', js: true do
     before do
-      @data = syllabus
-      visit gaku.syllabus_path(@data)
+      @resource = syllabus
+      visit gaku.edit_syllabus_path(@resource)
     end
 
     it_behaves_like 'new note'
@@ -23,12 +19,11 @@ describe 'Syllabus Notes' do
 
   context 'existing', js: true do
     before do
-      @data = syllabus_with_note
-      visit gaku.syllabus_path(@data)
+      @resource = syllabus_with_note
+      visit gaku.edit_syllabus_path(@resource)
     end
 
     it_behaves_like 'edit note'
-
     it_behaves_like 'delete note'
   end
 

data/core/spec/requests/syllabuses/syllabuses_spec.rb

@@ -3,14 +3,11 @@ require 'spec_helper'
 describe 'Syllabus' do
 
   before { as :admin }
+  before(:all) { set_resource 'syllabus' }
 
   let(:syllabus) { create(:syllabus, name: 'Biology', code: 'bio') }
 
-  before do
-    set_resource 'syllabus'
-  end
-
-  context '#new ', js: true do
+  context 'new', js: true do
 
     before do
       visit gaku.syllabuses_path
@@ -19,7 +16,6 @@ describe 'Syllabus' do
     end
 
     it 'creates' do
-      tr_count = size_of(table_rows)
       expect do
         fill_in 'syllabus_name', with: 'Syllabus1'
         fill_in 'syllabus_code', with: 'code1'
@@ -28,116 +24,81 @@ describe 'Syllabus' do
         wait_until_invisible submit
       end.to change(Gaku::Syllabus, :count).by 1
 
-      page.find(new_link).visible?
-      size_of(table_rows).should eq tr_count+1
-    end
-
-    it {has_validations?}
-
-    it 'cancels adding' do
-      ensure_cancel_creating_is_working
+      has_content? 'Syllabus1'
+      has_content? 'code1'
+      count? '1'
     end
 
+    it { has_validations? }
   end
 
   context 'existing' do
 
-    before do
-      syllabus
-      visit gaku.syllabuses_path
-    end
-
-    context 'lists' do
+    before { syllabus }
 
-      it 'lists existing syllabuses' do
-        page.should have_content('List Syllabuses')
+    context 'edit', js: true do
 
-        within(table) do
-          page.should have_content('Biology')
-          page.should have_content('bio')
-        end
-        size_of(table_rows).should eq 2
-      end
+      context 'from edit view' do
+        xit 'edits' do
+          visit gaku.edit_syllabus_path(syllabus)
 
-      it 'shows' do
-        within(table) { click show_link }
-        current_path.should == "/syllabuses/#{syllabus.id}"
-      end
+          fill_in 'syllabus_name', with: 'Maths'
+          fill_in 'syllabus_code', with: 'math'
+          fill_in 'syllabus_description', with: 'Maths Description'
 
-    end
+          click submit
+          flash_updated?
 
-    context '#edit ', js: true do
+          has_content? 'Maths'
+          has_content? 'math'
 
-      before do
-        syllabus
-        click edit_link
-        wait_until_visible modal
-      end
+          has_no_content? 'Biology'
+          has_no_content? 'bio'
 
-      it 'has validations' do
-        fill_in 'syllabus_name', with: ''
-        has_validations?
+          expect(syllabus.reload.name).to eq 'Maths'
+        end
       end
 
-      it 'edits' do
-        fill_in 'syllabus_name', with: 'Maths'
-        fill_in 'syllabus_code', with: 'math'
-        fill_in 'syllabus_description', with: 'Maths Description'
-
-        click submit
-
-        page.should have_content('Maths')
-        page.should have_content('math')
-
-        page.should_not have_content 'Biology'
-        page.should_not have_content 'bio'
-
-        edited_syllabus = Gaku::Syllabus.last
-        edited_syllabus.name.should eq 'Maths'
-        edited_syllabus.code.should eq 'math'
-        edited_syllabus.description.should eq 'Maths Description'
-        flash_updated?
-      end
+      context 'from index view' do
+        before do
+          visit gaku.syllabuses_path
+          click js_edit_link
+          wait_until_visible modal
+        end
 
-      it 'cancels editting' do
-        ensure_cancel_modal_is_working
-      end
+        it 'edits from index' do
+          fill_in 'syllabus_name', with: 'Maths'
+          fill_in 'syllabus_code', with: 'math'
+          fill_in 'syllabus_description', with: 'Maths Description'
 
-      it 'edits from show view' do
-        visit gaku.syllabus_path(syllabus)
-        click edit_link
-        wait_until_visible modal
+          click submit
 
-        fill_in 'syllabus_name', with: 'Maths'
-        fill_in 'syllabus_code', with: 'math'
-        fill_in 'syllabus_description', with: 'Maths Description'
+          flash_updated?
 
-        click submit
+          has_content? 'Maths'
+          has_content? 'math'
 
-        page.should have_content('Maths')
-        page.should have_content('math')
+          has_no_content? 'Biology'
+          has_no_content? 'bio'
 
-        page.should_not have_content 'Biology'
-        page.should_not have_content 'bio'
+          expect(syllabus.reload.name).to eq 'Maths'
+        end
 
-        edited_syllabus = Gaku::Syllabus.last
-        edited_syllabus.name.should eq 'Maths'
-        edited_syllabus.code.should eq 'math'
-        edited_syllabus.description.should eq 'Maths Description'
-        flash_updated?
+        it 'has validations' do
+          fill_in 'syllabus_name', with: ''
+          has_validations?
+        end
       end
     end
 
-    it 'deletes', js: true do
+    xit 'deletes', js: true do
 
       expect do
         ensure_delete_is_working
       end.to change(Gaku::Syllabus, :count).by -1
 
-      page.should_not have_content("#{syllabus.code}")
-
+      has_no_content?("#{syllabus.code}")
     end
 
   end
-
 end