Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
5a70c3ed
Commit
5a70c3ed
authored
Jun 29, 2021
by
Alex Kalderimis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove references to service in buildkite model spec
parent
84dd0ca0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
+16
-16
spec/models/integrations/buildkite_spec.rb
spec/models/integrations/buildkite_spec.rb
+16
-16
No files found.
spec/models/integrations/buildkite_spec.rb
View file @
5a70c3ed
...
@@ -8,7 +8,7 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
...
@@ -8,7 +8,7 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
)
}
subject
(
:
service
)
do
subject
(
:
integration
)
do
described_class
.
create!
(
described_class
.
create!
(
project:
project
,
project:
project
,
properties:
{
properties:
{
...
@@ -25,17 +25,17 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
...
@@ -25,17 +25,17 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
end
end
describe
'Validations'
do
describe
'Validations'
do
context
'when
service
is active'
do
context
'when
integration
is active'
do
before
do
before
do
subject
.
active
=
true
subject
.
active
=
true
end
end
it
{
is_expected
.
to
validate_presence_of
(
:project_url
)
}
it
{
is_expected
.
to
validate_presence_of
(
:project_url
)
}
it
{
is_expected
.
to
validate_presence_of
(
:token
)
}
it
{
is_expected
.
to
validate_presence_of
(
:token
)
}
it_behaves_like
'issue tracker
service
URL attribute'
,
:project_url
it_behaves_like
'issue tracker
integration
URL attribute'
,
:project_url
end
end
context
'when
service
is inactive'
do
context
'when
integration
is inactive'
do
before
do
before
do
subject
.
active
=
false
subject
.
active
=
false
end
end
...
@@ -47,7 +47,7 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
...
@@ -47,7 +47,7 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
describe
'.supported_events'
do
describe
'.supported_events'
do
it
'supports push, merge_request, and tag_push events'
do
it
'supports push, merge_request, and tag_push events'
do
expect
(
service
.
supported_events
).
to
eq
%w(push merge_request tag_push)
expect
(
integration
.
supported_events
).
to
eq
%w(push merge_request tag_push)
end
end
end
end
...
@@ -57,18 +57,18 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
...
@@ -57,18 +57,18 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
end
end
it
'always activates SSL verification after saved'
do
it
'always activates SSL verification after saved'
do
service
.
create_service_hook
(
enable_ssl_verification:
false
)
integration
.
create_service_hook
(
enable_ssl_verification:
false
)
service
.
enable_ssl_verification
=
false
integration
.
enable_ssl_verification
=
false
service
.
active
=
true
integration
.
active
=
true
expect
{
service
.
save!
}
expect
{
integration
.
save!
}
.
to
change
{
service
.
service_hook
.
enable_ssl_verification
}.
from
(
false
).
to
(
true
)
.
to
change
{
integration
.
service_hook
.
enable_ssl_verification
}.
from
(
false
).
to
(
true
)
end
end
describe
'#webhook_url'
do
describe
'#webhook_url'
do
it
'returns the webhook url'
do
it
'returns the webhook url'
do
expect
(
service
.
webhook_url
).
to
eq
(
expect
(
integration
.
webhook_url
).
to
eq
(
'https://webhook.buildkite.com/deliver/secret-sauce-webhook-token'
'https://webhook.buildkite.com/deliver/secret-sauce-webhook-token'
)
)
end
end
...
@@ -76,7 +76,7 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
...
@@ -76,7 +76,7 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
describe
'#commit_status_path'
do
describe
'#commit_status_path'
do
it
'returns the correct status page'
do
it
'returns the correct status page'
do
expect
(
service
.
commit_status_path
(
'2ab7834c'
)).
to
eq
(
expect
(
integration
.
commit_status_path
(
'2ab7834c'
)).
to
eq
(
'https://gitlab.buildkite.com/status/secret-sauce-status-token.json?commit=2ab7834c'
'https://gitlab.buildkite.com/status/secret-sauce-status-token.json?commit=2ab7834c'
)
)
end
end
...
@@ -84,7 +84,7 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
...
@@ -84,7 +84,7 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
describe
'#build_page'
do
describe
'#build_page'
do
it
'returns the correct build page'
do
it
'returns the correct build page'
do
expect
(
service
.
build_page
(
'2ab7834c'
,
nil
)).
to
eq
(
expect
(
integration
.
build_page
(
'2ab7834c'
,
nil
)).
to
eq
(
'https://buildkite.com/organization-name/example-pipeline/builds?commit=2ab7834c'
'https://buildkite.com/organization-name/example-pipeline/builds?commit=2ab7834c'
)
)
end
end
...
@@ -92,9 +92,9 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
...
@@ -92,9 +92,9 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
describe
'#commit_status'
do
describe
'#commit_status'
do
it
'returns the contents of the reactive cache'
do
it
'returns the contents of the reactive cache'
do
stub_reactive_cache
(
service
,
{
commit_status:
'foo'
},
'sha'
,
'ref'
)
stub_reactive_cache
(
integration
,
{
commit_status:
'foo'
},
'sha'
,
'ref'
)
expect
(
service
.
commit_status
(
'sha'
,
'ref'
)).
to
eq
(
'foo'
)
expect
(
integration
.
commit_status
(
'sha'
,
'ref'
)).
to
eq
(
'foo'
)
end
end
end
end
...
@@ -104,7 +104,7 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
...
@@ -104,7 +104,7 @@ RSpec.describe Integrations::Buildkite, :use_clean_rails_memory_store_caching do
'https://gitlab.buildkite.com/status/secret-sauce-status-token.json?commit=123'
'https://gitlab.buildkite.com/status/secret-sauce-status-token.json?commit=123'
end
end
subject
{
service
.
calculate_reactive_cache
(
'123'
,
'unused'
)[
:commit_status
]
}
subject
{
integration
.
calculate_reactive_cache
(
'123'
,
'unused'
)[
:commit_status
]
}
it
'sets commit status to :error when status is 500'
do
it
'sets commit status to :error when status is 500'
do
stub_request
(
status:
500
)
stub_request
(
status:
500
)
...
...
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