Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
fcb37542
Commit
fcb37542
authored
8 years ago
by
Robert Speicher
Browse files
Options
Download
Email Patches
Plain Diff
Use `:empty_project` where possible in model specs
parent
f27721e8
Changes
66
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
42 additions
and
42 deletions
+42
-42
spec/models/ability_spec.rb
spec/models/ability_spec.rb
+5
-5
spec/models/ci/build_spec.rb
spec/models/ci/build_spec.rb
+1
-1
spec/models/ci/pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+4
-4
spec/models/ci/runner_spec.rb
spec/models/ci/runner_spec.rb
+3
-4
spec/models/commit_range_spec.rb
spec/models/commit_range_spec.rb
+1
-1
spec/models/commit_spec.rb
spec/models/commit_spec.rb
+7
-7
spec/models/commit_status_spec.rb
spec/models/commit_status_spec.rb
+1
-1
spec/models/compare_spec.rb
spec/models/compare_spec.rb
+1
-1
spec/models/concerns/issuable_spec.rb
spec/models/concerns/issuable_spec.rb
+3
-3
spec/models/concerns/mentionable_spec.rb
spec/models/concerns/mentionable_spec.rb
+4
-4
spec/models/concerns/milestoneish_spec.rb
spec/models/concerns/milestoneish_spec.rb
+1
-1
spec/models/concerns/project_features_compatibility_spec.rb
spec/models/concerns/project_features_compatibility_spec.rb
+1
-1
spec/models/cycle_analytics/code_spec.rb
spec/models/cycle_analytics/code_spec.rb
+1
-1
spec/models/cycle_analytics/issue_spec.rb
spec/models/cycle_analytics/issue_spec.rb
+1
-1
spec/models/cycle_analytics/plan_spec.rb
spec/models/cycle_analytics/plan_spec.rb
+1
-1
spec/models/cycle_analytics/production_spec.rb
spec/models/cycle_analytics/production_spec.rb
+1
-1
spec/models/cycle_analytics/review_spec.rb
spec/models/cycle_analytics/review_spec.rb
+1
-1
spec/models/cycle_analytics/staging_spec.rb
spec/models/cycle_analytics/staging_spec.rb
+2
-1
spec/models/cycle_analytics/test_spec.rb
spec/models/cycle_analytics/test_spec.rb
+1
-1
spec/models/deploy_keys_project_spec.rb
spec/models/deploy_keys_project_spec.rb
+2
-2
No files found.
spec/models/ability_spec.rb
View file @
fcb37542
...
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
Ability
,
lib:
true
do
describe
'.can_edit_note?'
do
let
(
:project
)
{
create
(
:empty_project
)
}
let
!
(
:note
)
{
create
(
:note_on_issue
,
project:
project
)
}
let
(
:note
)
{
create
(
:note_on_issue
,
project:
project
)
}
context
'using an anonymous user'
do
it
'returns false'
do
...
...
@@ -60,7 +60,7 @@ describe Ability, lib: true do
describe
'.users_that_can_read_project'
do
context
'using a public project'
do
it
'returns all the users'
do
project
=
create
(
:project
,
:public
)
project
=
create
(
:
empty_
project
,
:public
)
user
=
build
(
:user
)
expect
(
described_class
.
users_that_can_read_project
([
user
],
project
)).
...
...
@@ -69,7 +69,7 @@ describe Ability, lib: true do
end
context
'using an internal project'
do
let
(
:project
)
{
create
(
:project
,
:internal
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
:internal
)
}
it
'returns users that are administrators'
do
user
=
build
(
:user
,
admin:
true
)
...
...
@@ -120,7 +120,7 @@ describe Ability, lib: true do
end
context
'using a private project'
do
let
(
:project
)
{
create
(
:project
,
:private
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
:private
)
}
it
'returns users that are administrators'
do
user
=
build
(
:user
,
admin:
true
)
...
...
@@ -247,7 +247,7 @@ describe Ability, lib: true do
end
describe
'.project_disabled_features_rules'
do
let
(
:project
)
{
create
(
:project
,
wiki_access_level:
ProjectFeature
::
DISABLED
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
wiki_access_level:
ProjectFeature
::
DISABLED
)
}
subject
{
described_class
.
allowed
(
project
.
owner
,
project
)
}
...
...
This diff is collapsed.
Click to expand it.
spec/models/ci/build_spec.rb
View file @
fcb37542
require
'spec_helper'
describe
Ci
::
Build
,
:models
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let
(
:test_trace
)
{
'This is a test'
}
...
...
This diff is collapsed.
Click to expand it.
spec/models/ci/pipeline_spec.rb
View file @
fcb37542
...
...
@@ -284,7 +284,7 @@ describe Ci::Pipeline, models: true do
end
describe
'merge request metrics'
do
let
(
:project
)
{
FactoryGirl
.
create
:project
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:pipeline
)
{
FactoryGirl
.
create
(
:ci_empty_pipeline
,
status:
'created'
,
project:
project
,
ref:
'master'
,
sha:
project
.
repository
.
commit
(
'master'
).
id
)
}
let!
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
source_branch:
pipeline
.
ref
)
}
...
...
@@ -339,7 +339,7 @@ describe Ci::Pipeline, models: true do
end
context
'with non-empty project'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:pipeline
)
do
create
(
:ci_pipeline
,
...
...
@@ -890,7 +890,7 @@ describe Ci::Pipeline, models: true do
end
describe
"#merge_requests"
do
let
(
:project
)
{
FactoryGirl
.
create
:project
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:pipeline
)
{
FactoryGirl
.
create
(
:ci_empty_pipeline
,
status:
'created'
,
project:
project
,
ref:
'master'
,
sha:
project
.
repository
.
commit
(
'master'
).
id
)
}
it
"returns merge requests whose `diff_head_sha` matches the pipeline's SHA"
do
...
...
@@ -956,7 +956,7 @@ describe Ci::Pipeline, models: true do
end
describe
'notifications when pipeline success or failed'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:pipeline
)
do
create
(
:ci_pipeline
,
...
...
This diff is collapsed.
Click to expand it.
spec/models/ci/runner_spec.rb
View file @
fcb37542
...
...
@@ -91,8 +91,7 @@ describe Ci::Runner, models: true do
end
describe
'#can_pick?'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
)
}
let
(
:pipeline
)
{
create
(
:ci_pipeline
)
}
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let
(
:runner
)
{
create
(
:ci_runner
)
}
...
...
@@ -321,8 +320,8 @@ describe Ci::Runner, models: true do
describe
'.assignable_for'
do
let
(
:runner
)
{
create
(
:ci_runner
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:another_project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:another_project
)
{
create
(
:
empty_
project
)
}
before
do
project
.
runners
<<
runner
...
...
This diff is collapsed.
Click to expand it.
spec/models/commit_range_spec.rb
View file @
fcb37542
...
...
@@ -7,7 +7,7 @@ describe CommitRange, models: true do
it
{
is_expected
.
to
include_module
(
Referable
)
}
end
let!
(
:project
)
{
create
(
:project
,
:public
)
}
let!
(
:project
)
{
create
(
:project
,
:public
,
:repository
)
}
let!
(
:commit1
)
{
project
.
commit
(
"HEAD~2"
)
}
let!
(
:commit2
)
{
project
.
commit
}
...
...
This diff is collapsed.
Click to expand it.
spec/models/commit_spec.rb
View file @
fcb37542
require
'spec_helper'
describe
Commit
,
models:
true
do
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:project
)
{
create
(
:project
,
:public
,
:repository
)
}
let
(
:commit
)
{
project
.
commit
}
describe
'modules'
do
...
...
@@ -34,7 +34,7 @@ describe Commit, models: true do
end
describe
'#to_reference'
do
let
(
:project
)
{
create
(
:project
,
path:
'sample-project'
)
}
let
(
:project
)
{
create
(
:project
,
:repository
,
path:
'sample-project'
)
}
let
(
:commit
)
{
project
.
commit
}
it
'returns a String reference to the object'
do
...
...
@@ -42,13 +42,13 @@ describe Commit, models: true do
end
it
'supports a cross-project reference'
do
another_project
=
build
(
:project
,
name:
'another-project'
,
namespace:
project
.
namespace
)
another_project
=
build
(
:project
,
:repository
,
name:
'another-project'
,
namespace:
project
.
namespace
)
expect
(
commit
.
to_reference
(
another_project
)).
to
eq
"sample-project@
#{
commit
.
id
}
"
end
end
describe
'#reference_link_text'
do
let
(
:project
)
{
create
(
:project
,
path:
'sample-project'
)
}
let
(
:project
)
{
create
(
:project
,
:repository
,
path:
'sample-project'
)
}
let
(
:commit
)
{
project
.
commit
}
it
'returns a String reference to the object'
do
...
...
@@ -56,7 +56,7 @@ describe Commit, models: true do
end
it
'supports a cross-project reference'
do
another_project
=
build
(
:project
,
name:
'another-project'
,
namespace:
project
.
namespace
)
another_project
=
build
(
:project
,
:repository
,
name:
'another-project'
,
namespace:
project
.
namespace
)
expect
(
commit
.
reference_link_text
(
another_project
)).
to
eq
"sample-project@
#{
commit
.
short_id
}
"
end
end
...
...
@@ -131,7 +131,7 @@ eos
describe
'#closes_issues'
do
let
(
:issue
)
{
create
:issue
,
project:
project
}
let
(
:other_project
)
{
create
:
project
,
:public
}
let
(
:other_project
)
{
create
(
:empty_
project
,
:public
)
}
let
(
:other_issue
)
{
create
:issue
,
project:
other_project
}
let
(
:commiter
)
{
create
:user
}
...
...
@@ -154,7 +154,7 @@ eos
end
it_behaves_like
'a mentionable'
do
subject
{
create
(
:project
).
commit
}
subject
{
create
(
:project
,
:repository
).
commit
}
let
(
:author
)
{
create
(
:user
,
email:
subject
.
author_email
)
}
let
(
:backref_text
)
{
"commit
#{
subject
.
id
}
"
}
...
...
This diff is collapsed.
Click to expand it.
spec/models/commit_status_spec.rb
View file @
fcb37542
require
'spec_helper'
describe
CommitStatus
,
models:
true
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:pipeline
)
do
create
(
:ci_pipeline
,
project:
project
,
sha:
project
.
commit
.
id
)
...
...
This diff is collapsed.
Click to expand it.
spec/models/compare_spec.rb
View file @
fcb37542
...
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
Compare
,
models:
true
do
include
RepoHelpers
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:project
)
{
create
(
:project
,
:public
,
:repository
)
}
let
(
:commit
)
{
project
.
commit
}
let
(
:start_commit
)
{
sample_image_commit
}
...
...
This diff is collapsed.
Click to expand it.
spec/models/concerns/issuable_spec.rb
View file @
fcb37542
...
...
@@ -301,7 +301,7 @@ describe Issue, "Issuable" do
end
describe
'#labels_array'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:bug
)
{
create
(
:label
,
project:
project
,
title:
'bug'
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
...
...
@@ -315,7 +315,7 @@ describe Issue, "Issuable" do
end
describe
'#user_notes_count'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:issue1
)
{
create
(
:issue
,
project:
project
)
}
let
(
:issue2
)
{
create
(
:issue
,
project:
project
)
}
...
...
@@ -359,7 +359,7 @@ describe Issue, "Issuable" do
end
describe
".with_label"
do
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
:public
)
}
let
(
:bug
)
{
create
(
:label
,
project:
project
,
title:
'bug'
)
}
let
(
:feature
)
{
create
(
:label
,
project:
project
,
title:
'feature'
)
}
let
(
:enhancement
)
{
create
(
:label
,
project:
project
,
title:
'enhancement'
)
}
...
...
This diff is collapsed.
Click to expand it.
spec/models/concerns/mentionable_spec.rb
View file @
fcb37542
...
...
@@ -13,7 +13,7 @@ describe Mentionable do
end
describe
'references'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:mentionable
)
{
Example
.
new
}
it
'excludes JIRA references'
do
...
...
@@ -83,13 +83,13 @@ describe Issue, "Mentionable" do
end
describe
'#create_cross_references!'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:author
)
{
build
(
:user
)
}
let
(
:commit
)
{
project
.
commit
}
let
(
:commit2
)
{
project
.
commit
}
let!
(
:issue
)
do
create
(
:issue
,
project:
project
,
description:
commit
.
to_reference
)
create
(
:issue
,
project:
project
,
description:
"See
#{
commit
.
to_reference
}
"
)
end
it
'correctly removes already-mentioned Commits'
do
...
...
@@ -100,7 +100,7 @@ describe Issue, "Mentionable" do
end
describe
'#create_new_cross_references!'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:author
)
{
create
(
:author
)
}
let
(
:issues
)
{
create_list
(
:issue
,
2
,
project:
project
,
author:
author
)
}
...
...
This diff is collapsed.
Click to expand it.
spec/models/concerns/milestoneish_spec.rb
View file @
fcb37542
...
...
@@ -7,7 +7,7 @@ describe Milestone, 'Milestoneish' do
let
(
:member
)
{
create
(
:user
)
}
let
(
:guest
)
{
create
(
:user
)
}
let
(
:admin
)
{
create
(
:admin
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
:public
)
}
let
(
:milestone
)
{
create
(
:milestone
,
project:
project
)
}
let!
(
:issue
)
{
create
(
:issue
,
project:
project
,
milestone:
milestone
)
}
let!
(
:security_issue_1
)
{
create
(
:issue
,
:confidential
,
project:
project
,
author:
author
,
milestone:
milestone
)
}
...
...
This diff is collapsed.
Click to expand it.
spec/models/concerns/project_features_compatibility_spec.rb
View file @
fcb37542
require
'spec_helper'
describe
ProjectFeaturesCompatibility
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:features
)
{
%w(issues wiki builds merge_requests snippets)
}
# We had issues_enabled, snippets_enabled, builds_enabled, merge_requests_enabled and issues_enabled fields on projects table
...
...
This diff is collapsed.
Click to expand it.
spec/models/cycle_analytics/code_spec.rb
View file @
fcb37542
...
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
'CycleAnalytics#code'
,
feature:
true
do
extend
CycleAnalyticsHelpers
::
TestGeneration
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:from_date
)
{
10
.
days
.
ago
}
let
(
:user
)
{
create
(
:user
,
:admin
)
}
subject
{
CycleAnalytics
.
new
(
project
,
from:
from_date
)
}
...
...
This diff is collapsed.
Click to expand it.
spec/models/cycle_analytics/issue_spec.rb
View file @
fcb37542
...
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
'CycleAnalytics#issue'
,
models:
true
do
extend
CycleAnalyticsHelpers
::
TestGeneration
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:from_date
)
{
10
.
days
.
ago
}
let
(
:user
)
{
create
(
:user
,
:admin
)
}
subject
{
CycleAnalytics
.
new
(
project
,
from:
from_date
)
}
...
...
This diff is collapsed.
Click to expand it.
spec/models/cycle_analytics/plan_spec.rb
View file @
fcb37542
...
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
'CycleAnalytics#plan'
,
feature:
true
do
extend
CycleAnalyticsHelpers
::
TestGeneration
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:from_date
)
{
10
.
days
.
ago
}
let
(
:user
)
{
create
(
:user
,
:admin
)
}
subject
{
CycleAnalytics
.
new
(
project
,
from:
from_date
)
}
...
...
This diff is collapsed.
Click to expand it.
spec/models/cycle_analytics/production_spec.rb
View file @
fcb37542
...
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
'CycleAnalytics#production'
,
feature:
true
do
extend
CycleAnalyticsHelpers
::
TestGeneration
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:from_date
)
{
10
.
days
.
ago
}
let
(
:user
)
{
create
(
:user
,
:admin
)
}
subject
{
CycleAnalytics
.
new
(
project
,
from:
from_date
)
}
...
...
This diff is collapsed.
Click to expand it.
spec/models/cycle_analytics/review_spec.rb
View file @
fcb37542
...
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
'CycleAnalytics#review'
,
feature:
true
do
extend
CycleAnalyticsHelpers
::
TestGeneration
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:from_date
)
{
10
.
days
.
ago
}
let
(
:user
)
{
create
(
:user
,
:admin
)
}
subject
{
CycleAnalytics
.
new
(
project
,
from:
from_date
)
}
...
...
This diff is collapsed.
Click to expand it.
spec/models/cycle_analytics/staging_spec.rb
View file @
fcb37542
...
...
@@ -3,9 +3,10 @@ require 'spec_helper'
describe
'CycleAnalytics#staging'
,
feature:
true
do
extend
CycleAnalyticsHelpers
::
TestGeneration
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:from_date
)
{
10
.
days
.
ago
}
let
(
:user
)
{
create
(
:user
,
:admin
)
}
subject
{
CycleAnalytics
.
new
(
project
,
from:
from_date
)
}
generate_cycle_analytics_spec
(
...
...
This diff is collapsed.
Click to expand it.
spec/models/cycle_analytics/test_spec.rb
View file @
fcb37542
...
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
'CycleAnalytics#test'
,
feature:
true
do
extend
CycleAnalyticsHelpers
::
TestGeneration
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:from_date
)
{
10
.
days
.
ago
}
let
(
:user
)
{
create
(
:user
,
:admin
)
}
subject
{
CycleAnalytics
.
new
(
project
,
from:
from_date
)
}
...
...
This diff is collapsed.
Click to expand it.
spec/models/deploy_keys_project_spec.rb
View file @
fcb37542
...
...
@@ -12,7 +12,7 @@ describe DeployKeysProject, models: true do
end
describe
"Destroying"
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
subject
{
create
(
:deploy_keys_project
,
project:
project
)
}
let
(
:deploy_key
)
{
subject
.
deploy_key
}
...
...
@@ -39,7 +39,7 @@ describe DeployKeysProject, models: true do
end
context
"when the deploy key is used by more than one project"
do
let!
(
:other_project
)
{
create
(
:project
)
}
let!
(
:other_project
)
{
create
(
:
empty_
project
)
}
before
do
other_project
.
deploy_keys
<<
deploy_key
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
3
4
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment