summaryrefslogtreecommitdiff
path: root/spec/serializers
diff options
context:
space:
mode:
authorKamil TrzciƄski <kamil@gitlab.com>2017-08-21 15:46:45 +0000
committerRobert Speicher <rspeicher@gmail.com>2017-09-07 20:22:16 -0400
commit4efd18d7e140bf2b6b95637af630e7294fcf28cc (patch)
tree107d92596480763bb1bd43ee85c6493ca18842a9 /spec/serializers
parent4acab552be05e2ee1ccb6ba1997b770dd89c42bd (diff)
downloadgitlab-ce-4efd18d7e140bf2b6b95637af630e7294fcf28cc.tar.gz
Merge branch '29943-environment-folder' into 'security-9-5'
Do not use `location.pathname` when accessing environments folders See merge request !2147
Diffstat (limited to 'spec/serializers')
-rw-r--r--spec/serializers/environment_entity_spec.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/serializers/environment_entity_spec.rb b/spec/serializers/environment_entity_spec.rb
index 979d9921941..8f32c5639a1 100644
--- a/spec/serializers/environment_entity_spec.rb
+++ b/spec/serializers/environment_entity_spec.rb
@@ -16,6 +16,10 @@ describe EnvironmentEntity do
expect(subject).to include(:id, :name, :state, :environment_path)
end
+ it 'exposes folder path' do
+ expect(subject).to include(:folder_path)
+ end
+
context 'metrics disabled' do
before do
allow(environment).to receive(:has_metrics?).and_return(false)