Download as
Browse Code »

Commit e8ac38fde31a48ec27a5d76ab48a9a94271cd50f

Authored by Diego Camarinha
2 parents 17b2b898 833bc28a
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Merge pull request #270 from mezuro/updates 

Updates
Showing 6 changed files with 64 additions and 66 deletions   Show diff stats
1 -2.2.2 1 +2.2.3
1 language: ruby 1 language: ruby
2 rvm: 2 rvm:
3 - - 2.2.2 3 + - 2.2.3
4 addons: 4 addons:
5 postgresql: "9.3" 5 postgresql: "9.3"
6 6
1 source 'https://rubygems.org' 1 source 'https://rubygems.org'
2 2
3 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' 3 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
4 -gem 'rails', '4.2.2' 4 +gem 'rails', '4.2.4'
5 5
6 # Use sqlite3 as the database for Active Record 6 # Use sqlite3 as the database for Active Record
7 gem 'sqlite3' 7 gem 'sqlite3'
@@ -31,7 +31,7 @@ gem 'jbuilder', '~> 2.0' @@ -31,7 +31,7 @@ gem 'jbuilder', '~> 2.0'
31 gem 'devise', '~> 3.5.1' 31 gem 'devise', '~> 3.5.1'
32 32
33 # Kalibro integration 33 # Kalibro integration
34 -gem 'kalibro_client', '~> 1.1.0' 34 +gem 'kalibro_client', '~> 1.3.0'
35 35
36 # PostgreSQL integration 36 # PostgreSQL integration
37 gem "pg", "~> 0.18.1" 37 gem "pg", "~> 0.18.1"
1 GIT 1 GIT
2 remote: https://github.com/seyhunak/twitter-bootstrap-rails.git 2 remote: https://github.com/seyhunak/twitter-bootstrap-rails.git
3 - revision: 935f53bb55ef736260fa2ef04e29da2fc3fb2b3f 3 + revision: a889e2d6e6527b94234b88f0c6b635d29d8e7ae8
4 specs: 4 specs:
5 twitter-bootstrap-rails (3.2.1) 5 twitter-bootstrap-rails (3.2.1)
6 actionpack (>= 3.1) 6 actionpack (>= 3.1)
@@ -11,42 +11,42 @@ GIT @@ -11,42 +11,42 @@ GIT
11 GEM 11 GEM
12 remote: https://rubygems.org/ 12 remote: https://rubygems.org/
13 specs: 13 specs:
14 - actionmailer (4.2.2)  
15 - actionpack (= 4.2.2)  
16 - actionview (= 4.2.2)  
17 - activejob (= 4.2.2) 14 + actionmailer (4.2.4)
  15 + actionpack (= 4.2.4)
  16 + actionview (= 4.2.4)
  17 + activejob (= 4.2.4)
18 mail (~> 2.5, >= 2.5.4) 18 mail (~> 2.5, >= 2.5.4)
19 rails-dom-testing (~> 1.0, >= 1.0.5) 19 rails-dom-testing (~> 1.0, >= 1.0.5)
20 - actionpack (4.2.2)  
21 - actionview (= 4.2.2)  
22 - activesupport (= 4.2.2) 20 + actionpack (4.2.4)
  21 + actionview (= 4.2.4)
  22 + activesupport (= 4.2.4)
23 rack (~> 1.6) 23 rack (~> 1.6)
24 rack-test (~> 0.6.2) 24 rack-test (~> 0.6.2)
25 rails-dom-testing (~> 1.0, >= 1.0.5) 25 rails-dom-testing (~> 1.0, >= 1.0.5)
26 - rails-html-sanitizer (~> 1.0, >= 1.0.1)  
27 - actionview (4.2.2)  
28 - activesupport (= 4.2.2) 26 + rails-html-sanitizer (~> 1.0, >= 1.0.2)
  27 + actionview (4.2.4)
  28 + activesupport (= 4.2.4)
29 builder (~> 3.1) 29 builder (~> 3.1)
30 erubis (~> 2.7.0) 30 erubis (~> 2.7.0)
31 rails-dom-testing (~> 1.0, >= 1.0.5) 31 rails-dom-testing (~> 1.0, >= 1.0.5)
32 - rails-html-sanitizer (~> 1.0, >= 1.0.1)  
33 - activejob (4.2.2)  
34 - activesupport (= 4.2.2) 32 + rails-html-sanitizer (~> 1.0, >= 1.0.2)
  33 + activejob (4.2.4)
  34 + activesupport (= 4.2.4)
35 globalid (>= 0.3.0) 35 globalid (>= 0.3.0)
36 - activemodel (4.2.2)  
37 - activesupport (= 4.2.2) 36 + activemodel (4.2.4)
  37 + activesupport (= 4.2.4)
38 builder (~> 3.1) 38 builder (~> 3.1)
39 - activerecord (4.2.2)  
40 - activemodel (= 4.2.2)  
41 - activesupport (= 4.2.2) 39 + activerecord (4.2.4)
  40 + activemodel (= 4.2.4)
  41 + activesupport (= 4.2.4)
42 arel (~> 6.0) 42 arel (~> 6.0)
43 - activesupport (4.2.2) 43 + activesupport (4.2.4)
44 i18n (~> 0.7) 44 i18n (~> 0.7)
45 json (~> 1.7, >= 1.7.7) 45 json (~> 1.7, >= 1.7.7)
46 minitest (~> 5.1) 46 minitest (~> 5.1)
47 thread_safe (~> 0.3, >= 0.3.4) 47 thread_safe (~> 0.3, >= 0.3.4)
48 tzinfo (~> 1.1) 48 tzinfo (~> 1.1)
49 - arel (6.0.0) 49 + arel (6.0.3)
50 bcrypt (3.1.10) 50 bcrypt (3.1.10)
51 better_errors (2.1.1) 51 better_errors (2.1.1)
52 coderay (>= 1.0.0) 52 coderay (>= 1.0.0)
@@ -55,8 +55,7 @@ GEM @@ -55,8 +55,7 @@ GEM
55 binding_of_caller (0.7.2) 55 binding_of_caller (0.7.2)
56 debug_inspector (>= 0.0.1) 56 debug_inspector (>= 0.0.1)
57 builder (3.2.2) 57 builder (3.2.2)
58 - byebug (5.0.0)  
59 - columnize (= 0.9.0) 58 + byebug (6.0.2)
60 capistrano (3.4.0) 59 capistrano (3.4.0)
61 i18n 60 i18n
62 rake (>= 10.0.0) 61 rake (>= 10.0.0)
@@ -70,7 +69,7 @@ GEM @@ -70,7 +69,7 @@ GEM
70 capistrano-rvm (0.1.2) 69 capistrano-rvm (0.1.2)
71 capistrano (~> 3.0) 70 capistrano (~> 3.0)
72 sshkit (~> 1.2) 71 sshkit (~> 1.2)
73 - capybara (2.4.4) 72 + capybara (2.5.0)
74 mime-types (>= 1.16) 73 mime-types (>= 1.16)
75 nokogiri (>= 1.3.3) 74 nokogiri (>= 1.3.3)
76 rack (>= 1.0.0) 75 rack (>= 1.0.0)
@@ -91,7 +90,6 @@ GEM @@ -91,7 +90,6 @@ GEM
91 coffee-script-source (1.9.1.1) 90 coffee-script-source (1.9.1.1)
92 colorize (0.7.7) 91 colorize (0.7.7)
93 colorpicker (0.0.5) 92 colorpicker (0.0.5)
94 - columnize (0.9.0)  
95 commonjs (0.2.7) 93 commonjs (0.2.7)
96 cucumber (1.3.20) 94 cucumber (1.3.20)
97 builder (>= 2.1.2) 95 builder (>= 2.1.2)
@@ -109,7 +107,7 @@ GEM @@ -109,7 +107,7 @@ GEM
109 dalli (2.7.4) 107 dalli (2.7.4)
110 database_cleaner (1.4.1) 108 database_cleaner (1.4.1)
111 debug_inspector (0.0.2) 109 debug_inspector (0.0.2)
112 - devise (3.5.1) 110 + devise (3.5.2)
113 bcrypt (~> 3.0) 111 bcrypt (~> 3.0)
114 orm_adapter (~> 0.1) 112 orm_adapter (~> 0.1)
115 railties (>= 3.2.6, < 5) 113 railties (>= 3.2.6, < 5)
@@ -121,11 +119,11 @@ GEM @@ -121,11 +119,11 @@ GEM
121 domain_name (0.5.24) 119 domain_name (0.5.24)
122 unf (>= 0.0.5, < 1.0.0) 120 unf (>= 0.0.5, < 1.0.0)
123 erubis (2.7.0) 121 erubis (2.7.0)
124 - eventmachine (1.0.7) 122 + eventmachine (1.0.8)
125 exception_notification (4.1.1) 123 exception_notification (4.1.1)
126 actionmailer (>= 3.0.4) 124 actionmailer (>= 3.0.4)
127 activesupport (>= 3.0.4) 125 activesupport (>= 3.0.4)
128 - execjs (2.5.2) 126 + execjs (2.6.0)
129 factory_girl (4.5.0) 127 factory_girl (4.5.0)
130 activesupport (>= 3.0.0) 128 activesupport (>= 3.0.0)
131 factory_girl_rails (4.5.0) 129 factory_girl_rails (4.5.0)
@@ -137,17 +135,17 @@ GEM @@ -137,17 +135,17 @@ GEM
137 faraday (>= 0.7.4, < 0.10) 135 faraday (>= 0.7.4, < 0.10)
138 gherkin (2.12.2) 136 gherkin (2.12.2)
139 multi_json (~> 1.3) 137 multi_json (~> 1.3)
140 - globalid (0.3.5) 138 + globalid (0.3.6)
141 activesupport (>= 4.1.0) 139 activesupport (>= 4.1.0)
142 google-analytics-rails (0.0.6) 140 google-analytics-rails (0.0.6)
143 http-cookie (1.0.2) 141 http-cookie (1.0.2)
144 domain_name (~> 0.5) 142 domain_name (~> 0.5)
145 http_accept_language (2.0.5) 143 http_accept_language (2.0.5)
146 i18n (0.7.0) 144 i18n (0.7.0)
147 - i18n_generators (1.2.1) 145 + i18n_generators (2.0.0)
148 mechanize 146 mechanize
149 rails (>= 3.0.0) 147 rails (>= 3.0.0)
150 - jbuilder (2.3.0) 148 + jbuilder (2.3.1)
151 activesupport (>= 3.0.0, < 5) 149 activesupport (>= 3.0.0, < 5)
152 multi_json (~> 1.2) 150 multi_json (~> 1.2)
153 jquery-rails (4.0.4) 151 jquery-rails (4.0.4)
@@ -157,7 +155,7 @@ GEM @@ -157,7 +155,7 @@ GEM
157 jquery-ui-rails (5.0.5) 155 jquery-ui-rails (5.0.5)
158 railties (>= 3.2.16) 156 railties (>= 3.2.16)
159 json (1.8.3) 157 json (1.8.3)
160 - kalibro_client (1.1.0) 158 + kalibro_client (1.3.0)
161 activesupport (>= 2.2.1) 159 activesupport (>= 2.2.1)
162 faraday_middleware (~> 0.9.0) 160 faraday_middleware (~> 0.9.0)
163 konacha (3.5.1) 161 konacha (3.5.1)
@@ -174,8 +172,8 @@ GEM @@ -174,8 +172,8 @@ GEM
174 less (~> 2.6.0) 172 less (~> 2.6.0)
175 sprockets (> 2, < 4) 173 sprockets (> 2, < 4)
176 tilt 174 tilt
177 - libv8 (3.16.14.7)  
178 - loofah (2.0.2) 175 + libv8 (3.16.14.11)
  176 + loofah (2.0.3)
179 nokogiri (>= 1.5.9) 177 nokogiri (>= 1.5.9)
180 mail (2.6.3) 178 mail (2.6.3)
181 mime-types (>= 1.16, < 3) 179 mime-types (>= 1.16, < 3)
@@ -191,10 +189,10 @@ GEM @@ -191,10 +189,10 @@ GEM
191 metaclass (0.0.4) 189 metaclass (0.0.4)
192 mime-types (2.6.1) 190 mime-types (2.6.1)
193 mini_portile (0.6.2) 191 mini_portile (0.6.2)
194 - minitest (5.7.0) 192 + minitest (5.8.0)
195 mocha (1.1.0) 193 mocha (1.1.0)
196 metaclass (~> 0.0.1) 194 metaclass (~> 0.0.1)
197 - multi_json (1.11.1) 195 + multi_json (1.11.2)
198 multi_test (0.1.2) 196 multi_test (0.1.2)
199 multipart-post (2.0.0) 197 multipart-post (2.0.0)
200 net-http-digest_auth (1.4) 198 net-http-digest_auth (1.4)
@@ -215,44 +213,44 @@ GEM @@ -215,44 +213,44 @@ GEM
215 rack (1.6.4) 213 rack (1.6.4)
216 rack-test (0.6.3) 214 rack-test (0.6.3)
217 rack (>= 1.0) 215 rack (>= 1.0)
218 - rails (4.2.2)  
219 - actionmailer (= 4.2.2)  
220 - actionpack (= 4.2.2)  
221 - actionview (= 4.2.2)  
222 - activejob (= 4.2.2)  
223 - activemodel (= 4.2.2)  
224 - activerecord (= 4.2.2)  
225 - activesupport (= 4.2.2) 216 + rails (4.2.4)
  217 + actionmailer (= 4.2.4)
  218 + actionpack (= 4.2.4)
  219 + actionview (= 4.2.4)
  220 + activejob (= 4.2.4)
  221 + activemodel (= 4.2.4)
  222 + activerecord (= 4.2.4)
  223 + activesupport (= 4.2.4)
226 bundler (>= 1.3.0, < 2.0) 224 bundler (>= 1.3.0, < 2.0)
227 - railties (= 4.2.2) 225 + railties (= 4.2.4)
228 sprockets-rails 226 sprockets-rails
229 rails-deprecated_sanitizer (1.0.3) 227 rails-deprecated_sanitizer (1.0.3)
230 activesupport (>= 4.2.0.alpha) 228 activesupport (>= 4.2.0.alpha)
231 - rails-dom-testing (1.0.6) 229 + rails-dom-testing (1.0.7)
232 activesupport (>= 4.2.0.beta, < 5.0) 230 activesupport (>= 4.2.0.beta, < 5.0)
233 nokogiri (~> 1.6.0) 231 nokogiri (~> 1.6.0)
234 rails-deprecated_sanitizer (>= 1.0.1) 232 rails-deprecated_sanitizer (>= 1.0.1)
235 rails-html-sanitizer (1.0.2) 233 rails-html-sanitizer (1.0.2)
236 loofah (~> 2.0) 234 loofah (~> 2.0)
237 - railties (4.2.2)  
238 - actionpack (= 4.2.2)  
239 - activesupport (= 4.2.2) 235 + railties (4.2.4)
  236 + actionpack (= 4.2.4)
  237 + activesupport (= 4.2.4)
240 rake (>= 0.8.7) 238 rake (>= 0.8.7)
241 thor (>= 0.18.1, < 2.0) 239 thor (>= 0.18.1, < 2.0)
242 rake (10.4.2) 240 rake (10.4.2)
243 rdoc (4.2.0) 241 rdoc (4.2.0)
244 - ref (1.0.5) 242 + ref (2.0.0)
245 responders (2.1.0) 243 responders (2.1.0)
246 railties (>= 4.2.0, < 5) 244 railties (>= 4.2.0, < 5)
247 - rspec-core (3.3.1) 245 + rspec-core (3.3.2)
248 rspec-support (~> 3.3.0) 246 rspec-support (~> 3.3.0)
249 - rspec-expectations (3.3.0) 247 + rspec-expectations (3.3.1)
250 diff-lcs (>= 1.2.0, < 2.0) 248 diff-lcs (>= 1.2.0, < 2.0)
251 rspec-support (~> 3.3.0) 249 rspec-support (~> 3.3.0)
252 - rspec-mocks (3.3.1) 250 + rspec-mocks (3.3.2)
253 diff-lcs (>= 1.2.0, < 2.0) 251 diff-lcs (>= 1.2.0, < 2.0)
254 rspec-support (~> 3.3.0) 252 rspec-support (~> 3.3.0)
255 - rspec-rails (3.3.2) 253 + rspec-rails (3.3.3)
256 actionpack (>= 3.0, < 4.3) 254 actionpack (>= 3.0, < 4.3)
257 activesupport (>= 3.0, < 4.3) 255 activesupport (>= 3.0, < 4.3)
258 railties (>= 3.0, < 4.3) 256 railties (>= 3.0, < 4.3)
@@ -261,7 +259,7 @@ GEM @@ -261,7 +259,7 @@ GEM
261 rspec-mocks (~> 3.3.0) 259 rspec-mocks (~> 3.3.0)
262 rspec-support (~> 3.3.0) 260 rspec-support (~> 3.3.0)
263 rspec-support (3.3.0) 261 rspec-support (3.3.0)
264 - sass (3.4.15) 262 + sass (3.4.18)
265 sass-rails (5.0.3) 263 sass-rails (5.0.3)
266 railties (>= 4.0.0, < 5.0) 264 railties (>= 4.0.0, < 5.0)
267 sass (~> 3.1) 265 sass (~> 3.1)
@@ -281,7 +279,7 @@ GEM @@ -281,7 +279,7 @@ GEM
281 sinon-rails (1.15.0) 279 sinon-rails (1.15.0)
282 railties (>= 3.1) 280 railties (>= 3.1)
283 spring (1.3.6) 281 spring (1.3.6)
284 - sprockets (3.2.0) 282 + sprockets (3.3.3)
285 rack (~> 1.0) 283 rack (~> 1.0)
286 sprockets-rails (2.3.2) 284 sprockets-rails (2.3.2)
287 actionpack (>= 3.0) 285 actionpack (>= 3.0)
@@ -306,7 +304,7 @@ GEM @@ -306,7 +304,7 @@ GEM
306 coffee-rails 304 coffee-rails
307 tzinfo (1.2.2) 305 tzinfo (1.2.2)
308 thread_safe (~> 0.1) 306 thread_safe (~> 0.1)
309 - uglifier (2.7.1) 307 + uglifier (2.7.2)
310 execjs (>= 0.3.0) 308 execjs (>= 0.3.0)
311 json (>= 1.8.0) 309 json (>= 1.8.0)
312 unf (0.1.4) 310 unf (0.1.4)
@@ -320,7 +318,7 @@ GEM @@ -320,7 +318,7 @@ GEM
320 railties (~> 4.0) 318 railties (~> 4.0)
321 sprockets-rails (>= 2.0, < 4.0) 319 sprockets-rails (>= 2.0, < 4.0)
322 webrobots (0.1.1) 320 webrobots (0.1.1)
323 - websocket-driver (0.5.4) 321 + websocket-driver (0.6.2)
324 websocket-extensions (>= 0.1.0) 322 websocket-extensions (>= 0.1.0)
325 websocket-extensions (0.1.2) 323 websocket-extensions (0.1.2)
326 xpath (2.0.0) 324 xpath (2.0.0)
@@ -353,12 +351,12 @@ DEPENDENCIES @@ -353,12 +351,12 @@ DEPENDENCIES
353 jbuilder (~> 2.0) 351 jbuilder (~> 2.0)
354 jquery-rails 352 jquery-rails
355 jquery-ui-rails (~> 5.0.0) 353 jquery-ui-rails (~> 5.0.0)
356 - kalibro_client (~> 1.1.0) 354 + kalibro_client (~> 1.3.0)
357 konacha 355 konacha
358 mocha 356 mocha
359 pg (~> 0.18.1) 357 pg (~> 0.18.1)
360 poltergeist (~> 1.6.0) 358 poltergeist (~> 1.6.0)
361 - rails (= 4.2.2) 359 + rails (= 4.2.4)
362 rails-html-sanitizer (~> 1.0) 360 rails-html-sanitizer (~> 1.0)
363 rspec-rails (~> 3.3.2) 361 rspec-rails (~> 3.3.2)
364 sass-rails (~> 5.0.0) 362 sass-rails (~> 5.0.0)
app/views/compound_metric_configurations/_form.html.erb
  Diff comments   View file @e8ac38f
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 </div> 36 </div>
37 <%= f.hidden_field(:kalibro_configuration_id, value: @kalibro_configuration_id) %> 37 <%= f.hidden_field(:kalibro_configuration_id, value: @kalibro_configuration_id) %>
38 <%= link_to t('back'), kalibro_configuration_path(@kalibro_configuration_id), class: 'btn btn-default' %> 38 <%= link_to t('back'), kalibro_configuration_path(@kalibro_configuration_id), class: 'btn btn-default' %>
39 - <%= f.submit t('save'), class: 'btn btn-primary' %>  
40 <% end %> 39 <% end %>
  40 + <%= f.submit t('save'), class: 'btn btn-primary' %>
41 </div> 41 </div>
42 </div> 42 </div>
features/support/env.rb
  Diff comments   View file @e8ac38f
@@ -24,7 +24,7 @@ require &#39;cucumber/rails&#39; @@ -24,7 +24,7 @@ require &#39;cucumber/rails&#39;
24 require 'capybara/poltergeist' 24 require 'capybara/poltergeist'
25 #Capybara.default_driver = :poltergeist 25 #Capybara.default_driver = :poltergeist
26 Capybara.javascript_driver = :poltergeist 26 Capybara.javascript_driver = :poltergeist
27 -Capybara.default_wait_time = 20 # default is 2 seconds 27 +Capybara.default_max_wait_time = 20 # default is 2 seconds
28 28
29 #require 'kalibro_gem/kalibro_cucumber_helpers/hooks' 29 #require 'kalibro_gem/kalibro_cucumber_helpers/hooks'
30 30