govuk_content_models 32.0.0 → 32.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6af733bb83f5e4d60a3c405a5492056904e47122
-  data.tar.gz: e5f073c62dd6f5ed47794f3d25e0ea2a82fd7407
+  metadata.gz: e1cf903c765eb0fc8a68cc9f8924b85054c13bbd
+  data.tar.gz: 6d397d3891fcb8c25594a87f10d245cff6de0f06
 SHA512:
-  metadata.gz: a94e635fc55b8526aac787f1d7f72e27e198d9f09704a7c4c577d4cd4668ebe3f3d3d78a4e5de52686c9b34dcb8ab3700801228ae6b82b822209fcae4d5a86d9
-  data.tar.gz: 547d3b7c4ae53e4e8715e1d8e53df28190a884e112bd6349c4c3f1555c9f3f929fa04645c77258cd71c6b62b47482ffe72edc2ff02c1893b02673a7777d8b613
+  metadata.gz: 5c6f0b8ba9a6e550f6d0ed0de0237be9a9bc9908c39bb468c2a2ffca322a937240da7b1ed6dc90882d37afca0063223e1b45fcbe4743d2cd4a03d3607e92a1e9
+  data.tar.gz: d9a05ab4a03b66a0608078785e7db503a19c5bf43d613a5b3706b45054df0bf00611ef0a7fb197ed42cabaa078d8e68601e1fa3097daf239768cf95014d01c68

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 32.1.0
+
+- Add GDS-SSO `User` linting and required `User#organisation_content_id` attribute
+
 ## 32.0.0
 
 - Add body and default parts to mainstream format factories

data/app/models/user.rb

@@ -14,14 +14,15 @@ class User
     defined?(USER_COLLECTION_NAME) ? USER_COLLECTION_NAME : "users"
   end
 
-  field "name",                type: String
-  field "uid",                 type: String
-  field "version",             type: Integer
-  field "email",               type: String
-  field "permissions",         type: Array
-  field "remotely_signed_out", type: Boolean, default: false
-  field "organisation_slug",   type: String
-  field "disabled",            type: Boolean, default: false
+  field "name",                    type: String
+  field "uid",                     type: String
+  field "version",                 type: Integer
+  field "email",                   type: String
+  field "permissions",             type: Array
+  field "remotely_signed_out",     type: Boolean, default: false
+  field "organisation_slug",       type: String
+  field "disabled",                type: Boolean, default: false
+  field "organisation_content_id", type: String
 
   index "uid", unique: true
   index "disabled"

data/govuk_content_models.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "bson_ext"
   gem.add_dependency "gds-api-adapters", ">= 10.9.0"
 
-  gem.add_dependency "gds-sso",          ">= 10.0.0"
+  gem.add_dependency "gds-sso",          "~> 11.2"
   gem.add_dependency "govspeak",         "~> 3.1"
   # Mongoid 2.5.0 supports the newer 1.7.x and 1.8.x Mongo drivers
   gem.add_dependency "mongoid",          "~> 2.5"

data/lib/govuk_content_models/test_helpers/factories.rb

@@ -135,7 +135,7 @@ FactoryGirl.define do
   factory :video_edition, traits: [:with_body], parent: :edition, :class => 'VideoEdition' do
   end
 
-  factory :business_support_edition, :parent => :edition, :class => "BusinessSupportEdition" do
+  factory :business_support_edition, traits: [:with_body], :parent => :edition, :class => "BusinessSupportEdition" do
   end
 
   factory :guide_edition, :parent => :edition, :class => "GuideEdition" do
@@ -194,6 +194,8 @@ FactoryGirl.define do
 
   factory :licence_edition, :parent => :edition, :class => "LicenceEdition" do
     licence_identifier "AB1234"
+    licence_short_description "This is a licence short description."
+    licence_overview "This is a licence overview."
   end
 
   factory :local_service do |ls|

data/lib/govuk_content_models/version.rb

@@ -1,4 +1,4 @@
 module GovukContentModels
   # Changing this causes Jenkins to tag and release the gem into the wild
-  VERSION = "32.0.0"
+  VERSION = "32.1.0"
 end

data/test/models/licence_edition_test.rb

@@ -57,7 +57,7 @@ class LicenceEditionTest < ActiveSupport::TestCase
       assert_equal 'wibble', new_version.licence_identifier
       assert new_version.valid?, "Expected clone to be valid"
     end
-    
+
     should "not validate the continuation link when blank" do
       @l.continuation_link = ""
       assert @l.valid?, "continuation link validation should not be triggered when the field is blank"
@@ -92,13 +92,13 @@ class LicenceEditionTest < ActiveSupport::TestCase
 
   context "indexable_content" do
     should "include the licence_overview, removing markup" do
-      licence = FactoryGirl.create(:licence_edition, licence_overview: "## Overview")
-      assert_equal "Overview", licence.indexable_content
+      licence = FactoryGirl.create(:licence_edition)
+      assert_includes licence.indexable_content, "This is a licence overview"
     end
 
     should "include the licence_short_description" do
-      licence = FactoryGirl.create(:licence_edition, licence_short_description: "Short desc")
-      assert_equal "Short desc", licence.indexable_content
+      licence = FactoryGirl.create(:licence_edition)
+      assert_includes licence.indexable_content, "This is a licence short description."
     end
   end
 end

data/test/models/user_test.rb

@@ -1,4 +1,11 @@
 require "test_helper"
+require "gds-sso/lint/user_test"
+
+class GDS::SSO::Lint::UserTest
+  def user_class
+    ::User
+  end
+end
 
 class UserTest < ActiveSupport::TestCase
   def setup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 32.0.0
+  version: 32.1.0
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -42,16 +42,16 @@ dependencies:
   name: gds-sso
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: '11.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: '11.2'
 - !ruby/object:Gem::Dependency
   name: govspeak
   requirement: !ruby/object:Gem::Requirement