deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove backward compatibility of factories.

Browse source
This commit is contained in:
Vincent Bonmalais 2012-11-06 14:31:55 +11:00
parent d52f06f380
commit 80fb38de7a
54 changed files with 261 additions and 279 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spec/requests/api/issues_spec.rb
View file

@ -3,9 +3,9 @@ require 'spec_helper'
describe Gitlab::API do
include ApiHelpers
let(:user) { Factory :user }
let!(:project) { Factory :project, owner: user }
let!(:issue) { Factory :issue, author: user, assignee: user, project: project }
let(:user) { create(:user) }
let!(:project) { create(:project, owner: user) }
let!(:issue) { create(:issue, author: user, assignee: user, project: project) }
before { project.add_access(user, :read) }
describe "GET /issues" do

16
spec/requests/api/merge_requests_spec.rb
View file

@ -1,11 +1,11 @@
require "spec_helper"
describe Gitlab::API do
describe Gitlab::API do
include ApiHelpers
let(:user) { Factory :user }
let!(:project) { Factory :project, owner: user }
let!(:merge_request) { Factory :merge_request, author: user, assignee: user, project: project, title: "Test" }
let(:user) { create(:user ) }
let!(:project) { create(:project, owner: user) }
let!(:merge_request) { create(:merge_request, author: user, assignee: user, project: project, title: "Test") }
before { project.add_access(user, :read) }
describe "GET /projects/:id/merge_requests" do
@ -39,7 +39,7 @@ describe Gitlab::API do
post api("/projects/#{project.code}/merge_requests", user),
title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user
response.status.should == 201
json_response['title'].should == 'Test merge_request'
json_response['title'].should == 'Test merge_request'
end
end
@ -47,7 +47,7 @@ describe Gitlab::API do
it "should return merge_request" do
put api("/projects/#{project.code}/merge_request/#{merge_request.id}", user), title: "New title"
response.status.should == 200
json_response['title'].should == 'New title'
json_response['title'].should == 'New title'
end
end
@ -55,7 +55,7 @@ describe Gitlab::API do
it "should return comment" do
post api("/projects/#{project.code}/merge_request/#{merge_request.id}/comments", user), note: "My comment"
response.status.should == 201
json_response['note'].should == 'My comment'
json_response['note'].should == 'My comment'
end
end

6
spec/requests/api/milestones_spec.rb
View file

@ -3,9 +3,9 @@ require 'spec_helper'
describe Gitlab::API do
include ApiHelpers
let(:user) { Factory :user }
let!(:project) { Factory :project, owner: user }
let!(:milestone) { Factory :milestone, project: project }
let(:user) { create(:user) }
let!(:project) { create(:project, owner: user) }
let!(:milestone) { create(:milestone, project: project) }
before { project.add_access(user, :read) }

18
spec/requests/api/projects_spec.rb
View file

@ -3,14 +3,14 @@ require 'spec_helper'
describe Gitlab::API do
include ApiHelpers
let(:user) { Factory :user }
let(:user2) { Factory.create(:user) }
let(:user3) { Factory.create(:user) }
let!(:hook) { Factory :project_hook, project: project, url: "http://example.com" }
let!(:project) { Factory :project, owner: user }
let!(:snippet) { Factory :snippet, author: user, project: project, title: 'example' }
let!(:users_project) { Factory :users_project, user: user, project: project, project_access: UsersProject::MASTER }
let!(:users_project2) { Factory :users_project, user: user3, project: project, project_access: UsersProject::DEVELOPER }
let(:user) { create(:user) }
let(:user2) { create(:user) }
let(:user3) { create(:user) }
let!(:hook) { create(:project_hook, project: project, url: "http://example.com") }
let!(:project) { create(:project, owner: user ) }
let!(:snippet) { create(:snippet, author: user, project: project, title: 'example') }
let!(:users_project) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
let!(:users_project2) { create(:users_project, user: user3, project: project, project_access: UsersProject::DEVELOPER) }
before { project.add_access(user, :read) }
describe "GET /projects" do
@ -52,7 +52,7 @@ describe Gitlab::API do
end
it "should assign attributes to project" do
project = Factory.attributes(:project, {
project = attributes_for(:project, {
path: 'path',
code: 'code',
description: Faker::Lorem.sentence,

2
spec/requests/api/session_spec.rb
View file

@ -3,7 +3,7 @@ require 'spec_helper'
describe Gitlab::API do
include ApiHelpers
let(:user) { Factory :user }
let(:user) { create(:user) }
describe "POST /session" do
context "when valid password" do

12
spec/requests/api/users_spec.rb
View file

@ -3,9 +3,9 @@ require 'spec_helper'
describe Gitlab::API do
include ApiHelpers
let(:user) { Factory :user }
let(:admin) { Factory :admin }
let(:key) { Factory :key, user: user }
let(:user) { create(:user) }
let(:admin) { create(:admin) }
let(:key) { create(:key, user: user) }
describe "GET /users" do
context "when unauthenticated" do
@ -43,12 +43,12 @@ describe Gitlab::API do
it "should create user" do
expect {
post api("/users", admin), Factory.attributes(:user, projects_limit: 3)
post api("/users", admin), attributes_for(:user, projects_limit: 3)
}.to change { User.count }.by(1)
end
it "shouldn't available for non admin users" do
post api("/users", user), Factory.attributes(:user)
post api("/users", user), attributes_for(:user)
response.status.should == 403
end
end
@ -103,7 +103,7 @@ describe Gitlab::API do
end
it "should create ssh key" do
key_attrs = Factory.attributes :key
key_attrs = attributes_for :key
expect {
post api("/user/keys", user), key_attrs
}.to change{ user.keys.count }.by(1)