scidea-schools 1.0.1 → 1.0.2

data/CHANGELOG

@@ -0,0 +1,2 @@
+1.0.2
+  - merged DRY search feature into admin controller

data/app/controllers/admin/schools_controller.rb

@@ -12,6 +12,11 @@ module Admin
       root << widget(:paginated_list) << widget(:datatable)
     end
 
+    def initialize
+      super
+      @sort_columns = %w[name city state zipcode approved]
+    end
+
     # GET /schools
     def index
       @schools = School.search(params[:search]).
@@ -112,14 +117,5 @@ module Admin
       end
     end
 
-
-    def per_page 
-      %w[25 50 100].include?(params[:per_page]) ? params[:per_page] : "25"  
-    end
-
-    def sort_column  
-      %w[name city state zipcode approved].include?(params[:sort]) ? params[:sort] : "name"  
-    end
-
   end
 end

data/features/schools/schools.feature

@@ -188,7 +188,15 @@ Feature: learners register and select a school with which they are associated
     And I press "Search"
     When I follow "Edit"
     And I follow "Add a new one." after ".schools-found, .schools-not-found" loads
-    Then I should be on the new admin school page
+    And I fill in "Name" with "My Favorite School" within "#new-school-form"
+    And I fill in "Address" with "400 Preston" within "#new-school-form"
+    And I fill in "Address 2" with "Ste 300" within "#new-school-form"
+    And I fill in "City" with "Cville" within "#new-school-form"
+    And I select "Virginia" from "State" within "#new-school-form"
+    And I fill in "Zipcode" with "22902" within "#new-school-form"
+    And I fill in "Phone" with "9876543210" within "#new-school-form"
+    And I press "Add Institution"
+    Then "My Favorite School" should be selected for "school-id"
     
   @javascript
   Scenario: admin edits user and changes their school

data/features/step_definitions/menu_steps.rb

@@ -1,4 +1,4 @@
 Given /^there exists a menu element "([^"]*)" linking to "([^"]*)" for menu "([^"]*)"$/ do |name, url, menu_name|
   menu = Menu.find_by_name(menu_name) || Factory(:menu, :name => menu_name)
-  Factory(:menu_element_with_url, :display_name => name, :menu => menu, :url => url)
+  Factory(:menu_element_admin_with_url, :display_name => name, :menu => menu, :url => url)
 end

data/features/support/env.rb

@@ -6,6 +6,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 
 require 'rspec/expectations'
 require 'cucumber/rails'
+require 'email_spec'
+require 'email_spec/cucumber'
 
 # Remove this line if your app doesn't have a database.
 # For some databases (like MongoDB and CouchDB) you may need to use :truncation instead.

data/features/support/paths.rb

@@ -14,6 +14,9 @@ module NavigationHelpers
     when /the registration page/
       '/users/sign_up'
 
+    when /the learner dashboard/
+      dashboard_path
+
     when /the qunit tests/
       "/qunit_tests"
 

data/lib/scidea/schools/version.rb

@@ -1,5 +1,5 @@
 module Scidea
   module Schools
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/spec/factories/menu_elements.rb

@@ -0,0 +1,3 @@
+Factory.define :menu_element_admin_with_url, :parent => :menu_element_with_url do |f|
+  f.view_roles { |m| [Role.product_admin, Role.course_admin, Role.user_admin] }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scidea-schools
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19952360 !ruby/object:Gem::Requirement
+  requirement: &12025880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *19952360
+  version_requirements: *12025880
 - !ruby/object:Gem::Dependency
   name: bartt-ssl_requirement
-  requirement: &19951740 !ruby/object:Gem::Requirement
+  requirement: &12025260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *19951740
+  version_requirements: *12025260
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &19951220 !ruby/object:Gem::Requirement
+  requirement: &12024680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19951220
+  version_requirements: *12024680
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &19950120 !ruby/object:Gem::Requirement
+  requirement: &12023580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *19950120
+  version_requirements: *12023580
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &19949500 !ruby/object:Gem::Requirement
+  requirement: &12023020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19949500
+  version_requirements: *12023020
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &19948920 !ruby/object:Gem::Requirement
+  requirement: &12022440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19948920
+  version_requirements: *12022440
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &19948400 !ruby/object:Gem::Requirement
+  requirement: &12021920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19948400
+  version_requirements: *12021920
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &19947760 !ruby/object:Gem::Requirement
+  requirement: &12021280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 3.0.0.beta
   type: :development
   prerelease: false
-  version_requirements: *19947760
+  version_requirements: *12021280
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &19947180 !ruby/object:Gem::Requirement
+  requirement: &12020640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19947180
+  version_requirements: *12020640
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &19946360 !ruby/object:Gem::Requirement
+  requirement: &12019720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19946360
+  version_requirements: *12019720
 description: Schools augments user's profiles with an associated school, along with
   interfaces for adding new schools at runtime. Administrators can manage schools
   and modify learner's schools.
@@ -212,6 +212,7 @@ files:
 - spec/controllers/schools_controller_spec.rb
 - spec/routing/admin/admin_schools_routing_spec.rb
 - spec/routing/schools_routing_spec.rb
+- spec/factories/menu_elements.rb
 - spec/factories/schools.rb
 - spec/support/controller_macros.rb
 - spec/models/school_spec.rb
@@ -221,6 +222,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- CHANGELOG
 homepage: https://github.com/phoenix-scitent/scidea-schools
 licenses: []
 post_install_message: