app/models/agents/java_script_agent.rb

@@ -39,6 +39,10 @@ module Agents

                       else
              

                         errors.add(:base, "The 'code' option is required") unless options['code'].present?
              

                       end
              

                +
              

                +      if interpolated['language'].present? && !interpolated['language'].downcase.in?(%w[javascript coffeescript])
              

                +        errors.add(:base, "The 'language' must be JavaScript or CoffeeScript")
              

                +      end
              

                     end
              

                 
              

                     def working?
              

spec/models/agents/java_script_agent_spec.rb

@@ -23,6 +23,24 @@ describe Agents::JavaScriptAgent do

                       expect(@agent).not_to be_valid
              

                     end
              

                 
              

                +    it "checks for a valid 'language', but allows nil" do
              

                +      expect(@agent).to be_valid
              

                +      @agent.options['language'] = ''
              

                +      expect(@agent).to be_valid
              

                +      @agent.options.delete('language')
              

                +      expect(@agent).to be_valid
              

                +      @agent.options['language'] = 'foo'
              

                +      expect(@agent).not_to be_valid
              

                +      @agent.options['language'] = 'javascript'
              

                +      expect(@agent).to be_valid
              

                +      @agent.options['language'] = 'JavaScript'
              

                +      expect(@agent).to be_valid
              

                +      @agent.options['language'] = 'coffeescript'
              

                +      expect(@agent).to be_valid
              

                +      @agent.options['language'] = 'CoffeeScript'
              

                +      expect(@agent).to be_valid
              

                +    end
              

                +
              

                     it "accepts a credential, but it must exist" do
              

                       expect(@agent).to be_valid
              

                       @agent.options['code'] = 'credential:foo'
              
@@ -74,7 +92,6 @@ describe Agents::JavaScriptAgent do

                       }.to change { Event.count }.by(2)
              

                     end
              

                 
              

                -
              

                     describe "using credentials as code" do
              

                       before do
              

                         @agent.user.user_credentials.create :credential_name => 'code-foo', :credential_value => 'Agent.check = function() { this.log("ran it"); };'
              
@@ -224,5 +241,17 @@ describe Agents::JavaScriptAgent do

                         }.not_to change { Event.count }
              

                       end
              

                     end
              

                +
              

                +    describe "using CoffeeScript" do
              

                +      it "will accept a 'language' of 'CoffeeScript'" do
              

                +        @agent.options['code'] = 'Agent.check = -> this.log("hello from coffeescript")'
              

                +        @agent.options['language'] = 'CoffeeScript'
              

                +        @agent.save!
              

                +        expect {
              

                +          @agent.check
              

                +        }.not_to raise_error
              

                +        expect(AgentLog.last.message).to eq("hello from coffeescript")
              

                +      end
              

                +    end
              

                   end
              

                 end