Merge pull request #274 from seuros/master

seuros · seuros · commit 75034d421f74 · 2014-12-30T16:46:14.000Z
Fix Award Api !483
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -856,7 +856,7 @@ DEPENDENCIES
   redis-rails (~> 3.2)
   rest-client
   rocket_tag
-  rspec-rails (~> 3.1)
+  rspec-rails
   rubocop
   ruby-progressbar
   sanitize
diff --git a/config/routes.rb b/config/routes.rb
@@ -76,7 +76,7 @@
 #                         api GET                   /api(.:format)                                         pages#show {:page=>:api}
 #                achievements GET                   /achievements(.:format)                                pages#show {:page=>:achievements}
 #                             GET                   /pages/:page(.:format)                                 pages#show
-#                 award_badge GET                   /award(.:format)                                       achievements#award
+#                 award_badge POST                  /award(.:format)                                       achievements#award
 #                authenticate GET|POST              /auth/:provider/callback(.:format)                     sessions#create
 #      authentication_failure GET                   /auth/failure(.:format)                                sessions#failure
 #                    settings GET                   /settings(.:format)                                    users#edit
@@ -356,7 +356,7 @@
   get 'achievements' => 'pages#show', :page => :achievements, as: :achievements if Rails.env.development?
   get '/pages/:page' => 'pages#show'
 
-  get 'award' => 'achievements#award', as: :award_badge
+  post 'award' => 'achievements#award', as: :award_badge
 
   match '/auth/:provider/callback' => 'sessions#create', as: :authenticate, via: [:get, :post]
   get '/auth/failure' => 'sessions#failure', as: :authentication_failure
diff --git a/spec/routing/achievements_routing_spec.rb b/spec/routing/achievements_routing_spec.rb
@@ -0,0 +1,9 @@
+RSpec.describe AchievementsController, type: :routing do
+  describe 'routing' do
+
+    it 'routes to #new' do
+      expect(post('/award')).to route_to(controller: 'achievements', action: 'award')
+    end
+
+  end
+end
