summaryrefslogtreecommitdiff
path: root/spec/models/service_spec.rb
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-10-14 19:21:27 +0300
committerValery Sizov <vsv2711@gmail.com>2015-10-14 19:21:27 +0300
commitb83a18a55cd03cfa6d0d631b8d4567ae29b5fe26 (patch)
tree8d4c05cf0b74779fb37cb492bf4dd3bd653c614b /spec/models/service_spec.rb
parent2fb02f9252f3083b44d1999a8421b3824e1929cb (diff)
downloadgitlab-ce-b83a18a55cd03cfa6d0d631b8d4567ae29b5fe26.tar.gz
Revert "Improve invalidation of stored service password if the endpoint URL is changed"
This reverts commit b46397548056e4e8ef00efe4f641c61ba1dd5230.
Diffstat (limited to 'spec/models/service_spec.rb')
-rw-r--r--spec/models/service_spec.rb39
1 files changed, 3 insertions, 36 deletions
diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index d42b96294ba..da87ea5b84f 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -116,47 +116,14 @@ describe Service do
)
end
- it "returns false when the property has not been assigned a new value" do
+ it "returns false" do
service.username = "key_changed"
expect(service.prop_updated?(:bamboo_url)).to be_falsy
end
- it "returns true when the property has been assigned a different value" do
- service.bamboo_url = "http://example.com"
+ it "returns true" do
+ service.bamboo_url = "http://other.com"
expect(service.prop_updated?(:bamboo_url)).to be_truthy
end
-
- it "returns true when the property has been re-assigned the same value" do
- service.bamboo_url = 'http://gitlab.com'
- expect(service.prop_updated?(:bamboo_url)).to be_truthy
- end
- end
-
- describe "#prop_modified?" do
- let(:service) do
- BambooService.create(
- project: create(:project),
- properties: {
- bamboo_url: 'http://gitlab.com',
- username: 'mic',
- password: "password"
- }
- )
- end
-
- it "returns false when the property has not been assigned a new value" do
- service.username = "key_changed"
- expect(service.prop_modified?(:bamboo_url)).to be_falsy
- end
-
- it "returns true when the property has been assigned a different value" do
- service.bamboo_url = "http://example.com"
- expect(service.prop_modified?(:bamboo_url)).to be_truthy
- end
-
- it "returns false when the property has been re-assigned the same value" do
- service.bamboo_url = 'http://gitlab.com'
- expect(service.prop_modified?(:bamboo_url)).to be_falsy
- end
end
end