gaku 0.0.1 → 0.0.2

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

@@ -3,48 +3,40 @@ require 'spec_helper'
 describe 'Teacher Contacts' do
 
   before { as :admin }
+  before(:all) { set_resource 'teacher-contact' }
 
   let(:teacher) { create(:teacher) }
   let(:teacher_with_contact) { create(:teacher, :with_contact) }
   let(:teacher_with_contacts) { create(:teacher, :with_contacts) }
-  let(:contact_type) { create(:contact_type, name: 'Email') }
-
-  before :all do
-    set_resource 'teacher-contact'
-  end
+  let!(:contact_type) { create(:contact_type, name: 'Email') }
 
   context 'new', js: true, type: 'contact' do
 
     before do
-      contact_type
-      visit gaku.edit_teacher_path(teacher)
+      @resource = teacher
+      visit gaku.edit_teacher_path(@resource)
       click tab_link
-      @data = teacher
+
     end
 
     it_behaves_like 'new contact'
-
   end
 
   context 'existing', type: 'contact' do
 
     context 'one contact' do
 
-      before(:each) do
-        @data = teacher_with_contact
-      end
+      before { @resource = teacher_with_contact }
 
       context 'edit', js: true do
 
         before do
-          visit gaku.edit_teacher_path(@data)
+          visit gaku.edit_teacher_path(@resource)
           click tab_link
         end
 
         it_behaves_like 'edit contact'
-
-        it_behaves_like 'delete contact', @data
-
+        it_behaves_like 'delete contact', @resource
       end
 
     end
@@ -52,13 +44,13 @@ describe 'Teacher Contacts' do
     context 'two contacts', type: 'contact' do
 
       before do
-        @data = teacher_with_contacts
-        visit gaku.edit_teacher_path(@data)
+        @resource = teacher_with_contacts
+        visit gaku.edit_teacher_path(@resource)
         click tab_link
       end
 
       it_behaves_like 'primary contacts'
-
     end
   end
+
 end

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

@@ -3,20 +3,16 @@ require 'spec_helper'
 describe 'Teacher Notes' do
 
   before { as :admin }
+  before(:all) { set_resource 'teacher-note' }
 
   let(:teacher) { create(:teacher) }
   let(:teacher_with_note) { create(:teacher, :with_note) }
   let(:note) { create(:note) }
 
-  before :all do
-    set_resource 'teacher-note'
-  end
-
   context 'new', type: 'note'  do
-
     before do
-      @data = teacher
-      visit gaku.edit_teacher_path(@data)
+      @resource = teacher
+      visit gaku.edit_teacher_path(@resource)
       click tab_link
     end
 
@@ -26,13 +22,12 @@ describe 'Teacher Notes' do
   context 'existing', type: 'note'  do
 
     before do
-      @data = teacher_with_note
-      visit gaku.edit_teacher_path(@data)
+      @resource = teacher_with_note
+      visit gaku.edit_teacher_path(@resource)
       click tab_link
     end
 
     it_behaves_like 'edit note'
-
     it_behaves_like 'delete note'
   end
 

data/core/spec/support/requests/shared_addresses_spec.rb

@@ -21,6 +21,10 @@ shared_examples 'new address' do
       end.to change(@resource.addresses, :count).by(1)
 
       has_content? 'Primary address'
+      count? 'Addresses list(1)'
+      if page.has_css?(tab_link)
+        within(tab_link)  { has_content? 'Addresses(1)' }
+      end
     end
 
     it 'has validations', js:true do
@@ -38,7 +42,7 @@ shared_examples_for 'edit address' do
   let(:address) { @resource.addresses.first }
 
   before do
-    click edit_link
+    click js_edit_link
     wait_until_visible modal
   end
 
@@ -149,7 +153,7 @@ shared_examples_for 'dynamic state dropdown' do
   end
 
   context 'edit form' do
-    before { click edit_link }
+    before { click js_edit_link }
 
     it 'changes country with state',js: true do
       select "#{country}", from: 'country_dropdown'

data/core/spec/support/requests/shared_contacts_spec.rb

@@ -16,7 +16,7 @@ shared_examples_for 'new contact' do
         fill_in 'contact_details', with: 'The contact details'
         click submit
         flash_created?
-      end.to change(@data.contacts, :count).by 1
+      end.to change(@resource.contacts, :count).by 1
 
       has_content? 'The contact data'
       has_content? 'The contact details'
@@ -32,19 +32,23 @@ end
 
 shared_examples_for 'edit contact' do
 
+  let(:contact) { @resource.contacts.first }
+
   before do
-    within(table) { click edit_link }
+    within(table) { click js_edit_link }
     wait_until_visible modal
   end
 
   it 'edits' do
+    old_contact = contact.data
     fill_in 'contact_data', with: 'example@genshin.org'
     click submit
 
     wait_until_invisible modal
     has_content? 'example@genshin.org'
     flash_updated?
-    expect(@data.contacts.first.reload.data).to eq 'example@genshin.org'
+    expect(@resource.contacts.first.reload.data).to eq 'example@genshin.org'
+    has_no_content? old_contact
   end
 
   it 'errors without required fields', js:true do
@@ -57,7 +61,7 @@ end
 shared_examples_for 'delete contact' do
 
   it 'deletes', js: true do
-    contact_field = @data.contacts.first.data
+    contact_field = @resource.contacts.first.data
 
     count? 'Contacts list(1)'
     if page.has_css?(tab_link)
@@ -69,8 +73,8 @@ shared_examples_for 'delete contact' do
       expect do
         ensure_delete_is_working
         flash_destroyed?
-      end.to change(@data.contacts, :count).by(-1)
-    end.to change(@data.contacts.deleted, :count).by(1)
+      end.to change(@resource.contacts, :count).by(-1)
+    end.to change(@resource.contacts.deleted, :count).by(1)
 
     within(count_div) { has_no_content? 'Contacts list(1)' }
     if page.has_css?(tab_link)
@@ -84,24 +88,24 @@ end
 shared_examples_for 'primary contacts' do
 
   it 'sets primary', js: true do
-    expect(@data.contacts.first.primary?).to eq true
-    expect(@data.contacts.second.primary?).to eq false
+    expect(@resource.contacts.first.primary?).to eq true
+    expect(@resource.contacts.second.primary?).to eq false
 
     within("#{table} tr#contact-2") { click_link 'set-primary-link' }
     accept_alert
 
-    within("#{table} tr#contact-#{@data.contacts.second.id}") do
+    within("#{table} tr#contact-#{@resource.contacts.second.id}") do
       expect(page).to have_css('.btn-primary')
     end
 
-    @data.contacts.reload
-    expect(@data.contacts.first.primary?).to eq false
-    expect(@data.contacts.second.primary?).to eq true
+    @resource.contacts.reload
+    expect(@resource.contacts.first.primary?).to eq false
+    expect(@resource.contacts.second.primary?).to eq true
   end
 
   it 'delete primary', js: true do
-    contact1_tr = "#contact-#{@data.contacts.first.id}"
-    contact2_tr = "#contact-#{@data.contacts.second.id}"
+    contact1_tr = "#contact-#{@resource.contacts.first.id}"
+    contact2_tr = "#contact-#{@resource.contacts.second.id}"
 
     within("#{table} #{contact2_tr}") { click_link 'set-primary-link' }
     accept_alert
@@ -112,6 +116,6 @@ shared_examples_for 'primary contacts' do
     accept_alert
 
     page.find("#{contact1_tr} .primary-contact a.btn-primary")
-    expect(@data.contacts.first.primary?).to eq true
+    expect(@resource.contacts.first.primary?).to eq true
   end
 end

data/core/spec/support/requests/shared_notes_spec.rb

@@ -1,28 +1,28 @@
 shared_examples_for 'new note' do
-  
+
   context 'new' do
-    
+
     before do
       click new_link
-      wait_until_visible submit  
+      wait_until_visible submit
     end
 
     it 'adds and shows', js: true do
       expect do
-        fill_in 'note_title',   with: 'The note title'
-        fill_in 'note_content', with: 'The note content'
-        click submit
-        wait_until_invisible submit
-      end.to change(@data.notes, :count).by 1
-
-      page.should have_content 'The note title'
-      page.should have_content 'The note content'
-      within(count_div) { page.should have_content 'Notes list(1)' }
-      flash_created?
-    end
-
-    it 'cancels creating', js: true do
-      ensure_cancel_creating_is_working
+        expect do
+          fill_in 'note_title',   with: 'The note title'
+          fill_in 'note_content', with: 'The note content'
+          click submit
+          flash_created?
+        end.to change(Gaku::Note, :count).by(1)
+      end.to change(@resource.notes, :count).by(1)
+
+      has_content? 'The note title'
+      has_content? 'The note content'
+      count? 'Notes list(1)'
+      if page.has_css?(tab_link)
+        within(tab_link)  { has_content? 'Notes(1)' }
+      end
     end
 
     it 'has validations', js: true do
@@ -30,53 +30,54 @@ shared_examples_for 'new note' do
     end
 
   end
-  
 end
 
 shared_examples_for 'edit note' do
-  
+
+  let(:note) { @resource.notes.first }
+
   before do
-    within(table) { click edit_link }
+    within(table) { click js_edit_link }
     wait_until_visible modal
   end
 
   it 'edits', js:true do
+    old_note = note.title
     fill_in 'note_title',   with: 'Edited note title'
     fill_in 'note_content', with: 'Edited note content'
     click submit
 
-    wait_until_invisible modal
-    page.should have_content 'Edited note title'
-    page.should have_content 'Edited note content'
     flash_updated?
-  end
-
-  it 'cancels editting', js: true do
-    ensure_cancel_modal_is_working
+    has_content? 'Edited note title'
+    has_content? 'Edited note content'
+    has_no_content? old_note
+    expect(@resource.notes.first.reload.title).to eq 'Edited note title'
   end
 
   it 'errors without required fields', js:true do
     fill_in 'note_title', with: ''
     has_validations?
   end
-
 end
 
 shared_examples_for 'delete note' do
 
   it 'deletes', js: true do
-    note_field = @data.notes.first.title
+    note_field = @resource.notes.first.title
 
-    within(count_div) { page.should have_content 'Notes list(1)' }
-    page.should have_content note_field
+    count? 'Notes list(1)'
+    has_content? note_field
 
     expect do
       ensure_delete_is_working
-    end.to change(@data.notes, :count).by -1
+      flash_destroyed?
+    end.to change(@resource.notes, :count).by(-1)
 
-    within(count_div) { page.should_not have_content 'Notes list(1)' }
-    page.should_not have_content note_field
-    flash_destroyed?
+    within(count_div) { has_no_content? 'Notes list(1)' }
+    if page.has_css?(tab_link)
+      within(tab_link)  { has_no_content? 'Notes(1)' }
+    end
+    has_no_content? note_field
   end
 
 end

data/gaku_dependencies.rb

@@ -1,13 +1,6 @@
 source 'http://production.s3.rubygems.org'
 
-gem 'pg'
-
-gem 'sass-rails',   '~> 4.0.0'
-gem 'coffee-rails', '~> 4.0.0'
-gem 'uglifier',     '>= 1.0.3'
-
-gem 'globalize3',  github: 'svenfuchs/globalize3', branch: 'rails4'
-gem 'gaku_helpers', github: 'kalkov/gaku_helpers'
+gem 'globalize3',  github: 'globalize/globalize', branch: 'rails4', ref: '82b3b36308677745b261bd147dda00ed4560a25d'
 
 group :development do
   gem 'guard'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaku
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Rei Kagetsuki
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gaku_core
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: gaku_sample
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 description: It allows for full student management, grading etc. It's bascally what
   all student grading tools are with some unique features
 email: info@genshin.org
@@ -208,7 +208,6 @@ files:
 - core/app/controllers/gaku/admin/system_tools_controller.rb
 - core/app/controllers/gaku/admin/templates_controller.rb
 - core/app/controllers/gaku/admin/users_controller.rb
-- core/app/controllers/gaku/assignments_controller.rb
 - core/app/controllers/gaku/attachments_controller.rb
 - core/app/controllers/gaku/attendances_controller.rb
 - core/app/controllers/gaku/class_group_enrollments_controller.rb
@@ -1014,6 +1013,7 @@ files:
 - core/app/views/gaku/syllabuses/assignments/create.js.erb
 - core/app/views/gaku/syllabuses/create.js.erb
 - core/app/views/gaku/syllabuses/destroy.js.erb
+- core/app/views/gaku/syllabuses/edit.html.slim
 - core/app/views/gaku/syllabuses/edit.js.erb
 - core/app/views/gaku/syllabuses/exam_syllabuses/create.js.erb
 - core/app/views/gaku/syllabuses/exam_syllabuses/destroy.js.erb
@@ -1032,7 +1032,6 @@ files:
 - core/app/views/gaku/syllabuses/importer/index.html.slim
 - core/app/views/gaku/syllabuses/index.html.slim
 - core/app/views/gaku/syllabuses/new.js.erb
-- core/app/views/gaku/syllabuses/show.html.slim
 - core/app/views/gaku/syllabuses/update.js.erb
 - core/app/views/gaku/teachers/_delete_modal.html.slim
 - core/app/views/gaku/teachers/_edit_table.html.slim
@@ -1224,9 +1223,10 @@ files:
 - core/spec/controllers/gaku/course_groups/course_groups_controller_spec.rb
 - core/spec/controllers/gaku/courses/courses_controller_spec.rb
 - core/spec/controllers/gaku/exams/exams_controller_spec.rb
+- core/spec/controllers/gaku/notes_controller_spec.rb
 - core/spec/controllers/gaku/students/guardians_controller_spec.rb
 - core/spec/controllers/gaku/students/students_controller_spec.rb
-- core/spec/controllers/gaku/syllabuses/syllabuses_controller_spec.rb
+- core/spec/controllers/gaku/syllabuses_controller_spec.rb
 - core/spec/controllers/gaku/teachers_controller_spec.rb
 - core/spec/coverage/.last_run.json
 - core/spec/coverage/.resultset.json