Merge pull request #292 from seuros/teammanage

seuros · seuros · commit 60d764ec9a1c · 2015-01-10T15:40:42.000Z
team slug is citext now, restore previous admins for premium teams
diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
@@ -93,7 +93,6 @@ def create
   #end
 
   def edit
-    #TODO, change slug to citext
     @team = Team.find_by_slug(params[:slug])
     return head(:forbidden) unless current_user.belongs_to_team?(@team) || current_user.admin?
     @edit_mode = true
diff --git a/config/routes.rb b/config/routes.rb
@@ -119,9 +119,9 @@
 #                      alerts GET                   /alerts(.:format)                                      alerts#create
 #                             GET                   /alerts(.:format)                                      alerts#index
 #                 follow_user POST                  /users/:username/follow(.:format)                      follows#create {:type=>:user}
-#                    teamname GET                   /team/:slug(.:format)                                  teams#show
 #               teamname_edit GET                   /team/:slug/edit(.:format)                             teams#edit
 #                         job GET                   /team/:slug(/:job_id)(.:format)                        teams#show
+#                    teamname GET                   /team/:slug(.:format)                                  teams#show
 #                 accept_team GET                   /teams/:id/accept(.:format)                            teams#accept
 #            record_exit_team POST                  /teams/:id/record-exit(.:format)                       teams#record_exit
 #               visitors_team GET                   /teams/:id/visitors(.:format)                          teams#visitors
@@ -383,9 +383,9 @@
 
   post '/users/:username/follow' => 'follows#create', as: :follow_user, :type => :user
 
-  get '/team/:slug' => 'teams#show', as: :teamname
   get '/team/:slug/edit' => 'teams#edit', as: :teamname_edit
   get '/team/:slug/(:job_id)' => 'teams#show', as: :job
+  get '/team/:slug' => 'teams#show', as: :teamname
 
   resources :teams do
     member do
diff --git a/db/migrate/20150110084027_change_team_slug_to_citext.rb b/db/migrate/20150110084027_change_team_slug_to_citext.rb
@@ -0,0 +1,5 @@
+class ChangeTeamSlugToCitext < ActiveRecord::Migration
+  def change
+    change_column :teams, :slug, :citext, null: false, index: true , unique: true
+  end
+end
diff --git a/db/migrate/20150110140000_restore_premium_team_admins.rb b/db/migrate/20150110140000_restore_premium_team_admins.rb
@@ -0,0 +1,10 @@
+class RestorePremiumTeamAdmins < ActiveRecord::Migration
+  def up
+    premium_admins = Teams::Account.pluck(:admin_id)
+    Teams::Member.where(user_id: premium_admins).update_all(role: 'admin')
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150109101515) do
+ActiveRecord::Schema.define(:version => 20150110140000) do
 
   add_extension "citext"
   add_extension "hstore"
@@ -365,7 +365,7 @@
     t.decimal  "score",                    :precision => 40, :scale => 30, :default => 0.0
     t.string   "twitter"
     t.string   "facebook"
-    t.string   "slug"
+    t.citext   "slug",                                                                           :null => false
     t.boolean  "premium",                                                  :default => false
     t.boolean  "analytics",                                                :default => false
     t.boolean  "valid_jobs",                                               :default => false
diff --git a/spec/routing/teams_routing_spec.rb b/spec/routing/teams_routing_spec.rb
@@ -0,0 +1,19 @@
+RSpec.describe TeamsController, type: :routing do
+  describe 'routing' do
+    it 'routes to #show' do
+      expect(get('/team/coderwall')).to route_to(controller: 'teams', action: 'show', slug: 'coderwall')
+    end
+
+    it 'routes to #edit with ' do
+      expect(get('/team/test-team/edit')).to route_to(controller: 'teams', action: 'edit', slug: 'test-team')
+    end
+
+    it 'routes to #edit' do
+      expect(get('/team/coderwall/edit')).to route_to(controller: 'teams', action: 'edit', slug: 'coderwall')
+    end
+
+    it 'routes to #show with  job id' do
+      expect(get('/team/coderwall/666')).to route_to(controller: 'teams', action: 'show', slug: 'coderwall', job_id: '666')
+    end
+  end
+end
