diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-10 20:47:47 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-10 20:47:47 +0300 |
| commit | 6135eb0adf6e3f2a13b7ef1d998b02a0f3349cc4 (patch) | |
| tree | 63e30bb9b5f8191ef341fd05eb255dbf9cdb4aa1 /spec | |
| parent | 4a5719f99075a1bdcce727899e9186ac78d096f0 (diff) | |
| parent | a0dbcd2365b9c90892ccd0c5dfb18c7c58de8704 (diff) | |
| download | gitlab-ce-6135eb0adf6e3f2a13b7ef1d998b02a0f3349cc4.tar.gz | |
Merge pull request #7705 from dblessing/serialize_service_properties
Serialize service properties
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/factories.rb | 1 | ||||
| -rw-r--r-- | spec/models/assembla_service_spec.rb | 7 | ||||
| -rw-r--r-- | spec/models/flowdock_service_spec.rb | 7 | ||||
| -rw-r--r-- | spec/models/gemnasium_service_spec.rb | 7 | ||||
| -rw-r--r-- | spec/models/gitlab_ci_service_spec.rb | 7 | ||||
| -rw-r--r-- | spec/models/service_spec.rb | 7 | ||||
| -rw-r--r-- | spec/models/slack_service_spec.rb | 7 |
7 files changed, 6 insertions, 37 deletions
diff --git a/spec/factories.rb b/spec/factories.rb index 03c87fcc6c5..f7f65bffb8b 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -165,7 +165,6 @@ FactoryGirl.define do factory :service do type "" title "GitLab CI" - token "x56olispAND34ng" project end diff --git a/spec/models/assembla_service_spec.rb b/spec/models/assembla_service_spec.rb index acc08fc4d69..0ef475b87c3 100644 --- a/spec/models/assembla_service_spec.rb +++ b/spec/models/assembla_service_spec.rb @@ -5,16 +5,11 @@ # id :integer not null, primary key # type :string(255) # title :string(255) -# token :string(255) # project_id :integer not null # created_at :datetime # updated_at :datetime # active :boolean default(FALSE), not null -# project_url :string(255) -# subdomain :string(255) -# room :string(255) -# recipients :text -# api_key :string(255) +# properties :text # require 'spec_helper' diff --git a/spec/models/flowdock_service_spec.rb b/spec/models/flowdock_service_spec.rb index 25ad133e122..710b8cba502 100644 --- a/spec/models/flowdock_service_spec.rb +++ b/spec/models/flowdock_service_spec.rb @@ -5,16 +5,11 @@ # id :integer not null, primary key # type :string(255) # title :string(255) -# token :string(255) # project_id :integer not null # created_at :datetime # updated_at :datetime # active :boolean default(FALSE), not null -# project_url :string(255) -# subdomain :string(255) -# room :string(255) -# recipients :text -# api_key :string(255) +# properties :text # require 'spec_helper' diff --git a/spec/models/gemnasium_service_spec.rb b/spec/models/gemnasium_service_spec.rb index efdf0dc891b..5de645cdf33 100644 --- a/spec/models/gemnasium_service_spec.rb +++ b/spec/models/gemnasium_service_spec.rb @@ -5,16 +5,11 @@ # id :integer not null, primary key # type :string(255) # title :string(255) -# token :string(255) # project_id :integer not null # created_at :datetime # updated_at :datetime # active :boolean default(FALSE), not null -# project_url :string(255) -# subdomain :string(255) -# room :string(255) -# recipients :text -# api_key :string(255) +# properties :text # require 'spec_helper' diff --git a/spec/models/gitlab_ci_service_spec.rb b/spec/models/gitlab_ci_service_spec.rb index 439a30869bb..e4cd8bb90c3 100644 --- a/spec/models/gitlab_ci_service_spec.rb +++ b/spec/models/gitlab_ci_service_spec.rb @@ -5,16 +5,11 @@ # id :integer not null, primary key # type :string(255) # title :string(255) -# token :string(255) # project_id :integer not null # created_at :datetime # updated_at :datetime # active :boolean default(FALSE), not null -# project_url :string(255) -# subdomain :string(255) -# room :string(255) -# recipients :text -# api_key :string(255) +# properties :text # require 'spec_helper' diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb index adeeac115c1..480aeabf67f 100644 --- a/spec/models/service_spec.rb +++ b/spec/models/service_spec.rb @@ -5,16 +5,11 @@ # id :integer not null, primary key # type :string(255) # title :string(255) -# token :string(255) # project_id :integer not null # created_at :datetime # updated_at :datetime # active :boolean default(FALSE), not null -# project_url :string(255) -# subdomain :string(255) -# room :string(255) -# recipients :text -# api_key :string(255) +# properties :text # require 'spec_helper' diff --git a/spec/models/slack_service_spec.rb b/spec/models/slack_service_spec.rb index b00eb30569b..4576913b473 100644 --- a/spec/models/slack_service_spec.rb +++ b/spec/models/slack_service_spec.rb @@ -5,16 +5,11 @@ # id :integer not null, primary key # type :string(255) # title :string(255) -# token :string(255) # project_id :integer not null # created_at :datetime # updated_at :datetime # active :boolean default(FALSE), not null -# project_url :string(255) -# subdomain :string(255) -# room :string(255) -# recipients :text -# api_key :string(255) +# properties :text # require 'spec_helper' |