Skip to content

Commit ec8d79b

Browse files
kurtedelbrockkurtedelbrock
committed
Closes #261
Squashed commit of the following: commit 60ebbd1 Author: Kurt Edelbrock <kurt.edelbrock@careerbuilder.com> Date: Fri May 20 08:23:45 2016 -0500 Adding git reflow to the gemfile to make life easier. commit 6d3ce36 Merge: f1ec222 fc3b520 Author: Kurt Edelbrock <kurt.edelbrock@careerbuilder.com> Date: Fri May 20 08:23:26 2016 -0500 Merge branch 'master' of github.com:cbdr/cortex into topic/COR-138-javascript-test-fail commit f1ec222 Author: Kurt Edelbrock <kurt.edelbrock@careerbuilder.com> Date: Fri May 20 08:17:31 2016 -0500 Fixed spec helper commit f96a0cb Author: Kurt Edelbrock <kurt.edelbrock@careerbuilder.com> Date: Fri May 20 08:13:03 2016 -0500 Fixing phantomjs version to get javascript tests to work. commit 3a8119f Author: Kurt Edelbrock <kurt.edelbrock@careerbuilder.com> Date: Fri May 20 07:57:24 2016 -0500 Adding gem to test AND develop so it actually works
1 parent fc3b520 commit ec8d79b

File tree

6 files changed

+98
-88
lines changed

6 files changed

+98
-88
lines changed

‎Gemfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ group :test do
121121
gem 'email_spec'
122122

123123
# Javascript
124-
gem 'jasmine-rails', '~> 0.12.2'
125124
gem 'guard-jasmine', '~> 2.0.6'
126125
gem 'jasmine-core', '~> 2.4'
127126

@@ -132,6 +131,9 @@ end
132131

133132
group :test, :development do
134133
gem 'fog', '~> 1.37.0'
134+
gem 'phantomjs', '~> 1.9.8'
135+
gem 'jasmine-rails', '~> 0.12.2'
136+
gem 'git_reflow'
135137
end
136138

137139
group :staging, :production do

‎Gemfile.lock‎

Lines changed: 73 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
GIT
22
remote: git://github.com/kikonen/ngannotate-rails
3-
revision: d8b9589108995ff6c438788f13df8f05879f7184
3+
revision: 9a094d128cfbc9c92bd47a8eb9c829d95a8b38a2
44
branch: master
55
specs:
6-
ngannotate-rails (1.2.1)
6+
ngannotate-rails (1.2.2)
77
execjs
88
rails (>= 3.1)
99

@@ -68,12 +68,12 @@ GEM
6868
awesome_nested_set (3.0.3)
6969
activerecord (>= 4.0.0, < 5)
7070
awesome_print (1.6.1)
71-
aws-sdk (2.2.35)
72-
aws-sdk-resources (= 2.2.35)
73-
aws-sdk-core (2.2.35)
71+
aws-sdk (2.3.7)
72+
aws-sdk-resources (= 2.3.7)
73+
aws-sdk-core (2.3.7)
7474
jmespath (~> 1.0)
75-
aws-sdk-resources (2.2.35)
76-
aws-sdk-core (= 2.2.35)
75+
aws-sdk-resources (2.3.7)
76+
aws-sdk-core (= 2.3.7)
7777
axiom-types (0.1.1)
7878
descendants_tracker (~> 0.0.4)
7979
ice_nine (~> 0.11.0)
@@ -87,8 +87,8 @@ GEM
8787
debug_inspector (>= 0.0.1)
8888
bower-rails (0.10.0)
8989
builder (3.2.2)
90-
byebug (8.2.4)
91-
capybara (2.7.0)
90+
byebug (9.0.4)
91+
capybara (2.7.1)
9292
addressable
9393
mime-types (>= 1.16)
9494
nokogiri (>= 1.3.3)
@@ -107,14 +107,15 @@ GEM
107107
coderay (1.1.1)
108108
coercible (1.0.0)
109109
descendants_tracker (~> 0.0.1)
110-
concurrent-ruby (1.0.1)
110+
colorize (0.7.7)
111+
concurrent-ruby (1.0.2)
111112
connection_pool (2.2.0)
112113
cortex-exceptions (0.0.4)
113-
database_cleaner (1.5.2)
114+
database_cleaner (1.5.3)
114115
debug_inspector (0.0.2)
115116
descendants_tracker (0.0.4)
116117
thread_safe (~> 0.3, >= 0.3.1)
117-
devise (3.5.7)
118+
devise (3.5.10)
118119
bcrypt (~> 3.0)
119120
orm_adapter (~> 0.1)
120121
railties (>= 3.2.6, < 5)
@@ -134,23 +135,23 @@ GEM
134135
elasticsearch-extensions (0.0.20)
135136
ansi
136137
ruby-prof
137-
elasticsearch-model (0.1.8)
138+
elasticsearch-model (0.1.9)
138139
activesupport (> 3)
139140
elasticsearch (> 0.4)
140141
hashie
141-
elasticsearch-rails (0.1.8)
142+
elasticsearch-rails (0.1.9)
142143
elasticsearch-transport (1.0.17)
143144
faraday
144145
multi_json
145-
email_spec (2.0.0)
146+
email_spec (2.1.0)
146147
htmlentities (~> 4.3.3)
147148
launchy (~> 2.1)
148149
mail (~> 2.6.3)
149150
enumerable-lazy (0.0.1)
150151
equalizer (0.0.11)
151152
erubis (2.7.0)
152153
excon (0.48.0)
153-
execjs (2.6.0)
154+
execjs (2.7.0)
154155
exifr (1.2.4)
155156
factory_girl (4.5.0)
156157
activesupport (>= 3.0.0)
@@ -159,6 +160,8 @@ GEM
159160
railties (>= 3.0.0)
160161
faraday (0.9.2)
161162
multipart-post (>= 1.2, < 3)
163+
faraday_middleware (0.9.2)
164+
faraday (>= 0.7.4, < 0.10)
162165
ffi (1.9.10)
163166
fission (0.5.0)
164167
CFPropertyList (~> 2.2)
@@ -247,7 +250,7 @@ GEM
247250
fog-serverlove (0.1.2)
248251
fog-core
249252
fog-json
250-
fog-softlayer (1.1.0)
253+
fog-softlayer (1.1.1)
251254
fog-core
252255
fog-json
253256
fog-storm_on_demand (0.1.1)
@@ -262,7 +265,7 @@ GEM
262265
fog-voxel (0.1.0)
263266
fog-core
264267
fog-xml
265-
fog-vsphere (0.6.4)
268+
fog-vsphere (0.7.0)
266269
fog-core
267270
rbvmomi (~> 1.8)
268271
fog-xenserver (0.2.3)
@@ -275,6 +278,22 @@ GEM
275278
sass (>= 3.2)
276279
formatador (0.2.5)
277280
fspath (2.1.1)
281+
git_reflow (0.7.5)
282+
colorize (>= 0.7.0)
283+
github_api (= 0.12.4)
284+
gli (= 2.13.2)
285+
highline
286+
httpclient
287+
reenhanced_bitbucket_api (= 0.3.2)
288+
github_api (0.12.4)
289+
addressable (~> 2.3)
290+
descendants_tracker (~> 0.0.4)
291+
faraday (~> 0.8, < 0.10)
292+
hashie (>= 3.4)
293+
multi_json (>= 1.7.5, < 2.0)
294+
nokogiri (~> 1.6.6)
295+
oauth2
296+
gli (2.13.2)
278297
globalid (0.3.6)
279298
activesupport (>= 4.1.0)
280299
gon (6.0.1)
@@ -299,9 +318,9 @@ GEM
299318
awesome_print
300319
grape (>= 0.12.0)
301320
grape-entity
302-
guard (2.13.0)
321+
guard (2.14.0)
303322
formatador (>= 0.2.4)
304-
listen (>= 2.7, <= 4.0)
323+
listen (>= 2.7, < 4.0)
305324
lumberjack (~> 1.0)
306325
nenv (~> 0.1)
307326
notiffany (~> 0.0)
@@ -327,8 +346,9 @@ GEM
327346
hashie-forbidden_attributes (0.1.1)
328347
hashie (>= 3.0)
329348
hashr (2.0.0)
349+
highline (1.7.8)
330350
htmlentities (4.3.4)
331-
httpclient (2.7.1)
351+
httpclient (2.8.0)
332352
i18n (0.7.0)
333353
ice_nine (0.11.2)
334354
image_optim (0.22.1)
@@ -363,15 +383,17 @@ GEM
363383
json_spec (1.1.4)
364384
multi_json (~> 1.0)
365385
rspec (>= 2.0, < 4.0)
386+
jwt (1.5.1)
366387
kaminari (0.16.3)
367388
actionpack (>= 3.0.0)
368389
activesupport (>= 3.0.0)
369390
kgio (2.10.0)
370391
launchy (2.4.3)
371392
addressable (~> 2.3)
372-
listen (3.0.6)
373-
rb-fsevent (>= 0.9.3)
374-
rb-inotify (>= 0.9.7)
393+
listen (3.1.5)
394+
rb-fsevent (~> 0.9, >= 0.9.4)
395+
rb-inotify (~> 0.9, >= 0.9.7)
396+
ruby_dep (~> 1.2)
375397
loofah (2.0.3)
376398
nokogiri (>= 1.5.9)
377399
lumberjack (1.0.10)
@@ -382,22 +404,28 @@ GEM
382404
mime-types (2.99.1)
383405
mimemagic (0.3.1)
384406
mini_portile2 (2.0.0)
385-
minitest (5.8.4)
407+
minitest (5.9.0)
386408
mocha (1.1.0)
387409
metaclass (~> 0.0.1)
388-
multi_json (1.12.0)
410+
multi_json (1.12.1)
389411
multi_xml (0.5.5)
390412
multipart-post (2.0.0)
391413
mustermann19 (0.4.3)
392414
enumerable-lazy
393415
nenv (0.3.0)
394-
newrelic_rpm (3.15.1.316)
416+
newrelic_rpm (3.15.2.317)
395417
ng-rails-csrf (0.1.0)
396418
nokogiri (1.6.7.2)
397419
mini_portile2 (~> 2.0.0.rc2)
398-
notiffany (0.0.8)
420+
notiffany (0.1.0)
399421
nenv (~> 0.1)
400422
shellany (~> 0.0)
423+
oauth2 (1.1.0)
424+
faraday (>= 0.8, < 0.10)
425+
jwt (~> 1.0, < 1.5.2)
426+
multi_json (~> 1.3)
427+
multi_xml (~> 0.5)
428+
rack (>= 1.2, < 3)
401429
orm_adapter (0.5.0)
402430
paperclip (5.0.0.beta2)
403431
activemodel (>= 4.2.0)
@@ -411,7 +439,7 @@ GEM
411439
paranoia (2.1.5)
412440
activerecord (~> 4.0)
413441
pg (0.18.4)
414-
phantomjs (2.1.1.0)
442+
phantomjs (1.9.8.0)
415443
poltergeist (1.9.0)
416444
capybara (~> 2.1)
417445
cliver (~> 0.3.1)
@@ -492,8 +520,15 @@ GEM
492520
redis-store (~> 1.1.0)
493521
redis-store (1.1.7)
494522
redis (>= 2.2)
523+
reenhanced_bitbucket_api (0.3.2)
524+
faraday (~> 0.9.0)
525+
faraday_middleware (~> 0.9.0)
526+
hashie (>= 3.2)
527+
multi_json (>= 1.7.5, < 2.0)
528+
nokogiri (>= 1.5.2)
529+
simple_oauth (>= 0.3.0)
495530
request_store (1.3.1)
496-
responders (2.1.2)
531+
responders (2.2.0)
497532
railties (>= 4.2.0, < 5.1)
498533
rspec (3.4.0)
499534
rspec-core (~> 3.4.0)
@@ -520,6 +555,7 @@ GEM
520555
sidekiq (>= 2.4.0)
521556
rspec-support (3.4.1)
522557
ruby-prof (0.15.9)
558+
ruby_dep (1.3.1)
523559
rubyzip (1.2.0)
524560
sass (3.4.22)
525561
sass-rails (5.0.4)
@@ -529,12 +565,13 @@ GEM
529565
sprockets-rails (>= 2.0, < 4.0)
530566
tilt (>= 1.1, < 3)
531567
shellany (0.0.1)
532-
sidekiq (4.1.1)
568+
sidekiq (4.1.2)
533569
concurrent-ruby (~> 1.0)
534570
connection_pool (~> 2.2, >= 2.2.0)
535571
redis (~> 3.2, >= 3.2.1)
536572
sidekiq-failures (0.4.5)
537573
sidekiq (>= 2.16.0)
574+
simple_oauth (0.3.1)
538575
simplecov (0.11.2)
539576
docile (~> 1.1.0)
540577
json (~> 1.8)
@@ -556,7 +593,7 @@ GEM
556593
sprockets (>= 3.0.0)
557594
thor (0.19.1)
558595
thread_safe (0.3.5)
559-
tilt (2.0.2)
596+
tilt (2.0.4)
560597
timecop (0.8.1)
561598
trollop (2.1.2)
562599
tzinfo (1.2.2)
@@ -577,13 +614,13 @@ GEM
577614
equalizer (~> 0.0, >= 0.0.9)
578615
warden (1.2.6)
579616
rack (>= 1.0)
580-
websocket-driver (0.6.3)
617+
websocket-driver (0.6.4)
581618
websocket-extensions (>= 0.1.0)
582619
websocket-extensions (0.1.2)
583620
xml-simple (1.1.5)
584621
xpath (2.0.0)
585622
nokogiri (~> 1.3)
586-
yt (0.25.34)
623+
yt (0.25.37)
587624
activesupport
588625

589626
PLATFORMS
@@ -615,6 +652,7 @@ DEPENDENCIES
615652
factory_girl_rails (~> 4.5.0)
616653
fog (~> 1.37.0)
617654
font-awesome-sass (~> 4.5.0)
655+
git_reflow
618656
gon (~> 6.0.1)
619657
grape (~> 0.16)
620658
grape-entity (~> 0.5.1)
@@ -641,6 +679,7 @@ DEPENDENCIES
641679
paperclip-optimizer (~> 2.0)
642680
paranoia (~> 2.1)
643681
pg (~> 0.18.4)
682+
phantomjs (~> 1.9.8)
644683
poltergeist
645684
pry-rails (~> 0.3)
646685
rack-cors (~> 0.4.0)

‎bower.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@
3131
"angular-sanitize": "~> 1.5.0",
3232
"bootstrap-switch": "~> 3.3.2",
3333
"angular-bootstrap-toggle-switch": "~> 0.5.5",
34-
"angular-validation-match": "< 1.4"
34+
"angular-validation-match": "< 1.4",
35+
"angular-mocks": "~> 1.2",
36+
"sinonjs": "~> 1.12.2",
37+
"sinon-ng": "~> 0.1.2",
38+
"angular-debaser": "~> 0.3.2"
3539
},
3640
"devDependencies": {
3741
"angular-mocks": "~> 1.2",

‎db/schema.rb‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@
1919
enable_extension "uuid-ossp"
2020

2121
create_table "applications", force: :cascade do |t|
22-
t.string "name"
22+
t.string "name", limit: 255
2323
t.datetime "created_at"
2424
t.datetime "updated_at"
25-
t.boolean "write", default: false
25+
t.boolean "write", default: false
2626
t.integer "tenant_id"
2727
end
2828

2929
add_index "applications", ["tenant_id"], name: "index_applications_on_tenant_id", using: :btree
3030

3131
create_table "authors", force: :cascade do |t|
32-
t.string "firstname"
33-
t.string "lastname"
34-
t.string "email"
32+
t.string "firstname", limit: 255
33+
t.string "lastname", limit: 255
34+
t.string "email", limit: 255
3535
t.hstore "sites"
36-
t.string "title"
36+
t.string "title", limit: 255
3737
t.text "bio"
3838
t.integer "user_id"
3939
end
@@ -89,7 +89,7 @@
8989
add_index "documents", ["user_id"], name: "index_documents_on_user_id", using: :btree
9090

9191
create_table "locales", id: :uuid, default: "uuid_generate_v4()", force: :cascade do |t|
92-
t.string "name", null: false
92+
t.string "name", limit: 255, null: false
9393
t.integer "localization_id"
9494
t.integer "user_id"
9595
t.datetime "created_at"
@@ -214,13 +214,13 @@
214214
t.string "seo_description", limit: 255
215215
t.string "seo_preview", limit: 255
216216
t.string "custom_author", limit: 255
217-
t.string "slug", null: false
217+
t.string "slug", limit: 255, null: false
218218
t.integer "featured_media_id"
219219
t.integer "primary_industry_id"
220220
t.integer "primary_category_id"
221221
t.integer "tile_media_id"
222222
t.hstore "meta"
223-
t.string "type", default: "Post", null: false
223+
t.string "type", limit: 255, default: "Post", null: false
224224
t.integer "author_id"
225225
t.boolean "is_wysiwyg", default: true
226226
end
@@ -326,7 +326,6 @@
326326
t.boolean "noodp", default: false
327327
t.boolean "noarchive", default: false
328328
t.boolean "noimageindex", default: false
329-
t.text "seo_keywords"
330329
end
331330

332331
add_index "webpages", ["user_id"], name: "index_webpages_on_user_id", using: :btree

0 commit comments

Comments
 (0)