use a shared example instead of method in spec_helper

Author: sethherr

spec/controllers/api/swagger_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'Swagger API V1 docs', type: :request do
-  describe 'all the paths' do 
+  describe 'all the paths' do
     it "responds with swagger for all the apis" do
       get '/api/v1/swagger_doc'
       result = JSON(response.body)

spec/controllers/api/v1/me_spec.rb

@@ -1,39 +1,38 @@
 require 'spec_helper'
 
 describe 'Me API V1', type: :request do
+  include_context :doorkeeper_app_with_token
   describe 'current' do
-    it "Sends correct error code when no user present" do
+    it 'Sends correct error code when no user present' do
       get '/api/v1/me'
       expect(response.response_code).to eq(401)
       expect(response.body.match('OAuth')).to be_present
       expect(response.headers['Content-Type'].match('json')).to be_present
       expect(response.headers['Access-Control-Allow-Origin']).to eq('*')
       expect(response.headers['Access-Control-Request-Method']).to eq('*')
     end
-    
-    it "fails if no access token" do 
+
+    it 'fails if no access token' do
       get '/api/v1/me', format: :json
       expect(response.response_code).to eq(401)
-      expect(JSON(response.body)["error"].present?).to be_truthy
+      expect(JSON(response.body)['error'].present?).to be_truthy
       expect(response.headers['Access-Control-Allow-Origin']).to eq('*')
       expect(response.headers['Access-Control-Request-Method']).to eq('*')
     end
 
-    it "responds with the user" do
-      create_doorkeeper_app(scopes: OAUTH_SCOPES_S)
-      get '/api/v1/me', format: :json, access_token: @token.token
+    it 'responds with the user' do
+      get '/api/v1/me', format: :json, access_token: access_token.token
       result = JSON.parse(response.body)
       expect(response.headers['Access-Control-Allow-Origin']).to eq('*')
-      expect(result['user']['name']).to eq(@user.name)
-      expect(result['user']['email']).to eq(@user.email)
+      expect(result['user']['name']).to eq(user.name)
+      expect(result['user']['email']).to eq(user.email)
       expect(response.response_code).to eq(200)
     end
   end
 
-  describe 'items' do 
-    it "gets items, returning correct pagination serialized by the serializer" do
-      create_doorkeeper_app(scopes: OAUTH_SCOPES_S)
-      get '/api/v1/me/items', format: :json, access_token: @token.token
+  describe 'items' do
+    it 'gets items, returning correct pagination serialized by the serializer' do
+      get '/api/v1/me/items', format: :json, access_token: access_token.token
       result = JSON.parse(response.body)
 
       expect(result['me'][0].keys.include?('secret')).to_not be_present
@@ -43,45 +42,42 @@
     end
   end
 
-  describe 'update current user' do 
+  describe 'update current user' do
+    let(:attribs) { { email: 'foo@bar.com', name: 'new namething', access_token: access_token.token } }
+
     context 'incorrectly scoped access token' do
       it "fails if the access token doesn't have the required scope" do
-        create_doorkeeper_app(scopes: 'read_user')
-        orig_name = @user.name
-        attribs = {email: 'foo@bar.com', name: 'new namething', access_token: @token.token}
+        access_token.update_attribute :scopes, 'read_user'
+        orig_name = user.name
         put '/api/v1/me', attribs, format: :json
 
         expect(response.response_code).to eq(403)
         expect(response.body.match(/OAuth error.* write to user/i)).to be_present
-        @user.reload
-        expect(@user.name).to eq(orig_name)
+        user.reload
+        expect(user.name).to eq(orig_name)
       end
     end
     context 'scoped access token' do
-      it "updates the user" do 
-        create_doorkeeper_app(scopes: 'write_user')
-        orig_name = @user.name
-        attribs = {email: 'foo@bar.com', name: 'new namething', access_token: @token.token}
+      before do
+        access_token.update_attribute :scopes, 'write_user'
+      end
+      it 'updates the user' do
         put '/api/v1/me', attribs, format: :json
-        @user.reload
-        result = JSON.parse(response.body)
-
         expect(response.response_code).to eq(200)
-        expect(@user.name).to eq('new namething')
-        expect(@user.email).to eq('foo@bar.com')
+        user.reload
+        expect(user.name).to eq('new namething')
+        expect(user.email).to eq('foo@bar.com')
       end
 
-      it "fails when one of the supplied values isn't in the params" do 
-        create_doorkeeper_app(scopes: 'write_user')
-        orig_name = @user.name
-        attribs = {demo_value: 'foo', name: 'other', access_token: @token.token}
-        put '/api/v1/me', attribs, format: :json
+      it "fails when one of the supplied values isn't in the params" do
+        orig_name = user.name
+        put '/api/v1/me', attribs.merge(demo_value: 'foo'), format: :json
 
         expect(response.response_code).to eq(400)
         expect(response.body).to match('demo_value does not have a valid value')
-        @user.reload
-        expect(@user.name).to_not eq('other')
+        user.reload
+        expect(user.name).to eq orig_name
       end
     end
   end
-end
+end

spec/controllers/documentation_controller_spec.rb

@@ -2,8 +2,8 @@
 
 describe DocumentationController do
 
-  describe 'view documentation index' do 
-    before do 
+  describe 'view documentation index' do
+    before do
       get :index
     end
     it { should respond_with(:success) }

spec/controllers/landing_controller_spec.rb

@@ -2,8 +2,8 @@
 
 describe LandingController do
 
-  describe 'view landing index' do 
-    before do 
+  describe 'view landing index' do
+    before do
       get :index
     end
     it { should respond_with(:success) }

spec/factories/default_factory.rb

@@ -13,4 +13,14 @@
     email { generate(:unique_email) }
   end
 
-end
+  factory :doorkeeper_application, class: Doorkeeper::Application do
+    name { generate(:unique_name) }
+    redirect_uri 'https://app.com'
+  end
+
+  factory :doorkeeper_token, class: Doorkeeper::AccessToken do
+    application_id { FactoryGirl.create(:doorkeeper_application).id }
+    resource_owner_id { FactoryGirl.create(:user).id }
+    scopes :public
+  end
+end

spec/spec_helper.rb

@@ -33,16 +33,3 @@
 
   config.infer_spec_type_from_file_location!
 end
-
-
-def create_doorkeeper
-  @user = FactoryGirl.create(:user)
-  @application = Doorkeeper::Application.create(name: "MyApp", redirect_uri: "https://app.com")
-end
-
-def create_doorkeeper_app(opts={})
-  create_doorkeeper
-  scopes = opts && opts[:scopes] || 'public'
-  @token = Doorkeeper::AccessToken.create!(application_id: @application.id,
-    resource_owner_id: @user.id, scopes: scopes)
-end

spec/support/doorkeeper_app_with_tokens.rb

@@ -0,0 +1,5 @@
+shared_context :doorkeeper_app_with_token do
+  let(:doorkeeper_application) { FactoryGirl.create(:doorkeeper_application) }
+  let(:user) { FactoryGirl.create(:user) }
+  let(:access_token) { FactoryGirl.create(:doorkeeper_token, application_id: doorkeeper_application.id, resource_owner_id: user.id) }
+end