Merge branch 'rs-rspec3' into 'master'

RSpec 3

Updates CI's specs to be a bit more like CE's to make that transition a little easier.

See merge request !246

1 files changed, 65 insertions, 67 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 5d648b3..b31b666 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,7 +35,7 @@ GEM
       tzinfo (~> 1.1)
     acts-as-taggable-on (3.4.3)
       activerecord (>= 3.2, < 5)
-    addressable (2.3.5)
+    addressable (2.3.8)
     annotate (2.6.0)
       activerecord (>= 2.3.0)
       rake (>= 0.8.7)
@@ -64,12 +64,15 @@ GEM
     byebug (3.2.0)
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
-    capybara (2.1.0)
+    capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    capybara-screenshot (1.0.11)
+      capybara (>= 1.0, < 3)
+      launchy
     celluloid (0.15.2)
       timers (~> 1.1.0)
     chronic (0.10.2)
@@ -93,9 +96,9 @@ GEM
       simplecov (~> 0.10.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-    crack (0.4.1)
-      safe_yaml (~> 0.9.0)
-    database_cleaner (1.3.0)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    database_cleaner (1.4.1)
     debugger-linecache (1.2.0)
     default_value_for (3.0.0.1)
       activerecord (>= 3.2.0, < 5.0)
@@ -106,7 +109,7 @@ GEM
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (0.9.0)
-    email_spec (1.5.0)
+    email_spec (1.6.0)
       launchy (~> 2.1)
       mail (~> 2.2)
     encryptor (1.3.0)
@@ -122,8 +125,7 @@ GEM
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     fastercsv (1.5.5)
-    ffaker (1.22.1)
-    ffi (1.9.3)
+    ffaker (2.0.0)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
     fog (1.25.0)
@@ -187,6 +189,9 @@ GEM
       dotenv (>= 0.7)
       thor (>= 0.13.6)
     formatador (0.2.4)
+    fuubar (2.0.0)
+      rspec (~> 3.0)
+      ruby-progressbar (~> 1.4)
     gitlab_ci_meta (4.0)
     grape (0.6.1)
       activesupport
@@ -201,16 +206,6 @@ GEM
     grape-entity (0.3.0)
       activesupport
       multi_json (>= 1.3.2)
-    growl (1.0.3)
-    guard (2.2.4)
-      formatador (>= 0.2.4)
-      listen (~> 2.1)
-      lumberjack (~> 1.0)
-      pry (>= 0.9.12)
-      thor (>= 0.18.1)
-    guard-rspec (4.2.0)
-      guard (>= 2.1.1)
-      rspec (>= 2.14, < 4.0)
     haml (4.0.6)
       tilt
     haml-rails (0.5.3)
@@ -245,15 +240,10 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.9.2)
-    launchy (2.4.2)
+    launchy (2.4.3)
       addressable (~> 2.3)
-    letter_opener (1.1.2)
+    letter_opener (1.4.1)
       launchy (~> 2.2)
-    listen (2.4.0)
-      celluloid (>= 0.15.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.4)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
@@ -288,16 +278,18 @@ GEM
     parser (2.2.0.2)
       ast (>= 1.1, < 3.0)
     pg (0.17.0)
-    poltergeist (1.5.1)
+    poltergeist (1.6.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     powerpack (0.0.9)
-    pry (0.9.12.4)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
+    pry-rails (0.3.4)
+      pry (>= 0.9.10)
     quiet_assets (1.0.2)
       railties (>= 3.1, < 5.0)
     rack (1.5.5)
@@ -329,9 +321,6 @@ GEM
     rainbow (2.0.0)
     raindrops (0.13.0)
     rake (10.4.2)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
-      ffi (>= 0.5.0)
     rbvmomi (1.8.2)
       builder
       nokogiri (>= 1.4.1)
@@ -344,21 +333,27 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    rspec-rails (2.14.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-rails (3.3.2)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     rubocop (0.28.0)
       astrolabe (~> 1.3)
       parser (>= 2.2.0.pre.7, < 3.0)
@@ -371,7 +366,7 @@ GEM
       sexp_processor (~> 4.0)
     ruby_parser (3.6.4)
       sexp_processor (~> 4.1)
-    safe_yaml (0.9.7)
+    safe_yaml (1.0.4)
     sass (3.2.19)
     sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
@@ -380,7 +375,7 @@ GEM
       sprockets-rails (~> 2.0)
     settingslogic (2.0.9)
     sexp_processor (4.5.0)
-    shoulda-matchers (2.4.0)
+    shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
     sidekiq (2.17.0)
       celluloid (>= 0.15.2)
@@ -401,7 +396,7 @@ GEM
     slim (2.0.2)
       temple (~> 0.6.6)
       tilt (>= 1.3.3, < 2.1)
-    slop (3.4.7)
+    slop (3.6.0)
     spring (1.3.6)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
@@ -445,10 +440,12 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0.1)
       equalizer (~> 0.0.7)
-    webmock (1.16.0)
-      addressable (>= 2.2.7)
+    webmock (1.21.0)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    websocket-driver (0.3.3)
+    websocket-driver (0.6.2)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
     whenever (0.8.4)
       activesupport (>= 2.3.4)
       chronic (>= 0.6.3)
@@ -467,23 +464,23 @@ DEPENDENCIES
   bootstrap-sass (~> 3.0)
   brakeman
   byebug
-  capybara
+  capybara (~> 2.4.0)
+  capybara-screenshot (~> 1.0.0)
   coffee-rails (~> 4.0.0)
   colored
   coveralls (~> 0.8.2)
-  database_cleaner
+  database_cleaner (~> 1.4.0)
   default_value_for (~> 3.0.0)
-  email_spec
+  email_spec (~> 1.6.0)
   factory_girl_rails
-  ffaker
+  ffaker (~> 2.0.0)
   fog (~> 1.25.0)
   font-awesome-rails (~> 3.2)
   foreman
+  fuubar (~> 2.0.0)
   gitlab_ci_meta (~> 4.0)
   grape
   grape-entity
-  growl
-  guard-rspec
   haml-rails (~> 0.5.3)
   hipchat (~> 1.5.0)
   httparty (= 0.11.0)
@@ -498,27 +495,25 @@ DEPENDENCIES
   oauth2 (= 1.0.0)
   paranoia (~> 2.0)
   pg
-  poltergeist (~> 1.5.1)
-  pry
+  poltergeist (~> 1.6.0)
+  pry-rails
   quiet_assets
   rack-mini-profiler
   rails (= 4.1.12)
   rake
-  rb-fsevent
-  rb-inotify
   request_store
-  rspec-rails
+  rspec-rails (~> 3.3.0)
   rubocop (= 0.28.0)
   sass-rails (~> 4.0.5)
   settingslogic
-  shoulda-matchers
+  shoulda-matchers (~> 2.8.0)
   sidekiq
   simplecov
   sinatra
   slack-notifier (~> 1.0.0)
   slim
   spring (~> 1.3.6)
-  spring-commands-rspec
+  spring-commands-rspec (~> 1.0.0)
   sprockets (~> 2.12.3)
   stamp
   state_machine
@@ -527,5 +522,8 @@ DEPENDENCIES
   unf
   unicorn (~> 4.8.2)
   virtus (= 1.0.1)
-  webmock
+  webmock (~> 1.21.0)
   whenever
+
+BUNDLED WITH
+   1.10.6