Patch 1

Team-Delta · Mar 5, 2014 · 68eb195 · 68eb195
1 parent 5e39165
commit 68eb195
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 91 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -81,8 +81,6 @@ GEM
     ffi (1.9.3)
     formatador (0.2.4)
     git (1.2.6)
-    growl_notify (0.0.3)
-      rb-appscript
     guard (2.4.0)
       formatador (>= 0.2.4)
       listen (~> 2.1)
@@ -153,7 +151,6 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
     rake (10.1.1)
-    rb-appscript (0.6.1)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.3)
       ffi (>= 0.5.0)
@@ -243,7 +240,6 @@ DEPENDENCIES
   devise
   factory_girl_rails
   git
-  growl_notify
   guard-rspec
   jbuilder (~> 1.2)
   jquery-rails

diff --git a/app/controllers/profile_controller.rb b/app/controllers/profile_controller.rb
@@ -11,13 +11,6 @@ def edit
     @info = User.all
   end
 
-  # def create
-  #   @info = User.new(post_params)
-
-  #   @info.save
-  #   redirect_to :back
-  # end
-
   private
 
   def post_params

diff --git a/config/routes.rb b/config/routes.rb
@@ -11,7 +11,6 @@
 
   get 'profile/edit'
   get 'profile/load'
-  get 'profile/create'
 
   get 'curricula/commits/:id' => 'curricula#commits', as: :c_commit
 

diff --git a/db/schema.rb b/db/schema.rb
@@ -13,23 +13,6 @@
 
 ActiveRecord::Schema.define(version: 20140224012254) do
 
-  create_table "change_requests", force: true do |t|
-    t.string   "target_branch",                   null: false
-    t.string   "source_branch",                   null: false
-    t.integer  "curriculas_id",                   null: false
-    t.integer  "author_id",                       null: false
-    t.integer  "assigned_id"
-    t.string   "title"
-    t.boolean  "closed",          default: false, null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "change_accepted", default: false, null: false
-    t.integer  "state",           default: 1,     null: false
-    t.integer  "milestone_id"
-    t.string   "change_status"
-    t.text     "description"
-  end
-
   create_table "curriculas", force: true do |t|
     t.string   "cur_name",        default: "*subject to change*", null: false
     t.text     "cur_description"
@@ -42,45 +25,6 @@
     t.boolean  "can_merge",       default: true,                  null: false
   end
 
-  create_table "curriculas_branches", force: true do |t|
-    t.integer  "curriculas_id", null: false
-    t.string   "name",          null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "milestones", force: true do |t|
-    t.string   "title",                         null: false
-    t.integer  "curriculas_id",                 null: false
-    t.text     "description"
-    t.date     "due_date"
-    t.boolean  "closed",        default: false, null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "namespace", force: true do |t|
-    t.string   "name",                     null: false
-    t.string   "path",                     null: false
-    t.integer  "owner_id"
-    t.string   "type"
-    t.string   "description", default: "", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "notifications", force: true do |t|
-    t.string   "notification_type"
-    t.integer  "target_id"
-    t.string   "title"
-    t.text     "data"
-    t.integer  "curriculas_id"
-    t.integer  "action"
-    t.integer  "author_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "user_curriculas", force: true do |t|
     t.integer "user_id"
     t.integer "curricula_id"
@@ -111,14 +55,6 @@
   add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
   add_index "users", ["username"], name: "index_users_on_username", unique: true, using: :btree
 
-  create_table "users_curriculas", force: true do |t|
-    t.integer  "user_id",                                null: false
-    t.integer  "curricula_id",                           null: false
-    t.integer  "curricula_permission_level", default: 0, null: false
-    t.datetime "created_at",                             null: false
-    t.datetime "updated_at",                             null: false
-  end
-
   create_table "watchings", force: true do |t|
     t.integer "user_id"
     t.integer "peer_id"

diff --git a/spec/controllers/profile_controller_spec.rb b/spec/controllers/profile_controller_spec.rb
@@ -9,13 +9,4 @@
       response.should be_success
     end
   end
-
-  # describe "GET 'create'"do
-  #   it 'returns http success' do
-  #      @info = {:description => 'post_params', :occupation => 'post_params'}
-  #     get 'create'
-  #     response should be_success
-  #     #@info.occupation.should eql nil
-  #   end
-  # end
 end
diff --git a/spec/features/create_curriculum_spec.rb b/spec/features/create_curriculum_spec.rb
@@ -6,9 +6,9 @@
     sign_in_with 'bammons123', '12345678'
   end
 
-  scenario'Make a Curriculum'do
+  scenario'Make a Curriculum' do
     make_curriculum_with 'This', 'Is AWESOME'
-    expect(page).to have_content('Successfully created curriculum ')
+    expect(page).to have_content('Successfully created curriculum')
   end
 
   def sign_in_with(email, password)
@@ -19,9 +19,7 @@ def sign_in_with(email, password)
   end
 
   def make_curriculum_with(name, description)
-   # click_button 'success'
     visit   '/curricula/create'
-    # expect(page).to have_content('Successfully created curriculum ')
     fill_in 'name', with: name
     fill_in 'description', with: description
     click_button 'Create'

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,7 +1,7 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV['RAILS_ENV'] ||= 'test'
-# require 'coveralls'
-# Coveralls.wear!('rails')
+require 'coveralls'
+Coveralls.wear!('rails')
 require 'simplecov'
 SimpleCov.start :rails do
   add_filter '/spec/'