Merge remote-tracking branch 'origin/master' into repo-bugsrepo-bugs

1 files changed, 11 insertions, 25 deletions

diff --git a/spec/lib/gitlab/ci/config/entry/configurable_spec.rb b/spec/lib/gitlab/ci/config/entry/configurable_spec.rb
index ae7e628b5b5..088d4b472da 100644
--- a/spec/lib/gitlab/ci/config/entry/configurable_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/configurable_spec.rb
@@ -1,40 +1,26 @@
 require 'spec_helper'
 
 describe Gitlab::Ci::Config::Entry::Configurable do
-  let(:entry) { Class.new }
-
-  before do
-    entry.include(described_class)
+  let(:entry) do
+    Class.new(Gitlab::Ci::Config::Entry::Node) do
+      include Gitlab::Ci::Config::Entry::Configurable
+    end
   end
 
   describe 'validations' do
-    let(:validator) { entry.validator.new(instance) }
-
-    before do
-      entry.class_eval do
-        attr_reader :config
+    context 'when entry is a hash' do
+      let(:instance) { entry.new(key: 'value') }
 
-        def initialize(config)
-          @config = config
-        end
+      it 'correctly validates an instance' do
+        expect(instance).to be_valid
       end
-
-      validator.validate
     end
 
-    context 'when entry validator is invalid' do
+    context 'when entry is not a hash' do
       let(:instance) { entry.new('ls') }
 
-      it 'returns invalid validator' do
-        expect(validator).to be_invalid
-      end
-    end
-
-    context 'when entry instance is valid' do
-      let(:instance) { entry.new(key: 'value') }
-
-      it 'returns valid validator' do
-        expect(validator).to be_valid
+      it 'invalidates the instance' do
+        expect(instance).not_to be_valid
       end
     end
   end