Merge pull request #8 from groupon/support_more_ruby_versions_in_travis

Support more ruby versions in travis
groupon · Apr 19, 2016 · 3562d94 · 3562d94
2 parents 912e5f6 + a87971c
commit 3562d94
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 29 deletions.
diff --git a/.ci.yml b/.ci.yml
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,14 @@
-sudo: required
+sudo: false
 
 language: ruby
 
+rvm:
+  - 2.0.0
+  - 2.1.6
+  - 2.2.3
+  - 2.3.0
+  - jruby-1.7.20
+
 services:
   - postgresql
   - redis

diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ $ bin/docker_console
 
 3. Install any of the supported Ruby versions:
   - JRuby 1.7.3 - 1.7.20
-  - MRI 1.9.3 - 2.1.6
+  - MRI 2.0.0 - 2.3.0
 
 4. Install [Bundler](http://gembundler.com/) if necessary:
 

diff --git a/spec/unit/workers/daily_activity_spec.rb b/spec/unit/workers/daily_activity_spec.rb
@@ -72,28 +72,30 @@
       allow(Backbeat::Config).to receive(:hostname).and_return("somehost")
 
       Timecop.freeze(start_time) do
-        expect(subject).to receive(:send_report).with({
-          inconsistent: {
-            counts: {
-              "bad workflow" => { workflow_type_count: 1, node_count: 1 }
+        expect(subject).to receive(:send_report) do |arg|
+          arg == {
+            inconsistent: {
+              counts: {
+                "bad workflow" => { workflow_type_count: 1, node_count: 1 }
+              },
+              filename: "/tmp/inconsistent_nodes/#{Date.today.to_s}.json",
+              hostname: "somehost"
             },
-            filename: "/tmp/inconsistent_nodes/#{Date.today.to_s}.json",
-            hostname: "somehost"
-          },
-          completed: {
-            counts: {
-              "fun workflow"=> { workflow_type_count: 1, node_count: 1 }
-            }
-          },
-          time_elapsed: 0,
-          range: {
-            completed_upper_bound: start_time,
-            completed_lower_bound: start_time - 24.hours,
-            inconsistent_upper_bound: start_time - 12.hours,
-            inconsistent_lower_bound: start_time - 1.year
-           },
-          date: start_time.strftime("%m/%d/%Y")
-        })
+            completed: {
+              counts: {
+                "fun workflow"=> { workflow_type_count: 1, node_count: 1 }
+              }
+            },
+            time_elapsed: 0,
+            range: {
+              completed_upper_bound: start_time,
+              completed_lower_bound: start_time - 24.hours,
+              inconsistent_upper_bound: start_time - 12.hours,
+              inconsistent_lower_bound: start_time - 1.year
+             },
+            date: start_time.strftime("%m/%d/%Y")
+          }
+        end
 
         subject.perform
       end