make create_event in dry_run work the same as the normal one; fix wid…

…th of editor
drives · May 9, 2015 · 5067104 · 5067104
1 parent 8b1bc3c
commit 5067104
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -388,7 +388,7 @@ GEM
     slop (3.6.0)
     spectrum-rails (1.3.4)
       railties (>= 3.1)
-    spring (1.3.3)
+    spring (1.3.6)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     sprockets (2.12.3)

diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb
@@ -174,12 +174,18 @@ span.not-applicable:after {
 
 // Credentials and Ace Editor
 
-#ace-credential-value, .ace-editor {
+#ace-credential-value {
   position: relative;
   width: 940px;
   height: 300px;
 }
 
+.ace-editor {
+  position: relative;
+  width: 550px;
+  height: 300px;
+}
+
 // Disabled
 
 .agent-unavailable {

diff --git a/app/concerns/dry_runnable.rb b/app/concerns/dry_runnable.rb
@@ -56,6 +56,7 @@ def log(message, options = {})
     def create_event(event_hash)
       if can_create_events?
         @dry_run_results[:events] << event_hash[:payload]
+        events.build({ user: user, expires_at: new_event_expiration_date }.merge(event_hash))
       else
         error "This Agent cannot create events!"
       end

diff --git a/app/models/agents/java_script_agent.rb b/app/models/agents/java_script_agent.rb
@@ -135,7 +135,7 @@ def code
     end
 
     def credential_referenced_by_code
-      interpolated['code'] =~ /\Acredential:(.*)\Z/ && $1
+      interpolated['code'] =~ /\Acredential:(.*)\Z/ && $1.strip
     end
 
     def setup_javascript