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