New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Rails 5] A few things fell through the cracks the 1st time around #71

Merged
merged 9 commits into from Feb 6, 2017
View
1 .rspec
@@ -1,3 +1,4 @@
--color
--format documentation
--order rand
--require spec_helper
View
@@ -175,7 +175,7 @@ group :test do
gem 'capybara'
gem 'poltergeist'
gem 'guard-rspec', require: false
gem 'shoulda-matchers', '~> 2.8.0'
gem 'shoulda-matchers', '~> 3.1'
gem 'timecop'
end
View
@@ -8,7 +8,7 @@ PATH
PATH
remote: ../dradis-brakeman/
specs:
dradis-brakeman (3.0.0)
dradis-brakeman (3.0.1)
dradis-plugins (~> 3.2)
PATH
@@ -358,8 +358,8 @@ GEM
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
shellany (0.0.1)
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
shoulda-matchers (3.1.1)
activesupport (>= 4.0.0)
simple_form (3.3.1)
actionpack (> 4, < 5.1)
activemodel (> 4, < 5.1)
@@ -484,7 +484,7 @@ DEPENDENCIES
resque-status
rspec-rails (~> 3.1)
sass-rails (~> 5.0)
shoulda-matchers (~> 2.8.0)
shoulda-matchers (~> 3.1)
simple_form
sinatra (= 2.0.0.beta2)
spring
View
@@ -1,10 +1,14 @@
require_relative 'boot'
# Pick the frameworks you want:
require 'active_record/railtie'
require 'action_controller/railtie'
require 'action_mailer/railtie'
require 'sprockets/railtie'
require "active_model/railtie"
require "active_job/railtie"
require "active_record/railtie"
require "action_controller/railtie"
require "action_mailer/railtie"
require "action_view/railtie"
require "action_cable/engine"
require "sprockets/railtie"
# require "rails/test_unit/railtie"
# Require the gems listed in Gemfile, including any gems
View
@@ -1,4 +1,3 @@
# encoding: UTF-8
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
@@ -20,11 +19,10 @@
t.string "action", null: false
t.datetime "created_at"
t.datetime "updated_at"
t.index ["created_at"], name: "index_activities_on_created_at"
t.index ["trackable_id", "trackable_type"], name: "index_activities_on_trackable_id_and_trackable_type"
end
add_index "activities", ["created_at"], name: "index_activities_on_created_at"
add_index "activities", ["trackable_id", "trackable_type"], name: "index_activities_on_trackable_id_and_trackable_type"
create_table "categories", force: :cascade do |t|
t.string "name"
t.datetime "created_at"
@@ -36,22 +34,20 @@
t.string "value"
t.datetime "created_at"
t.datetime "updated_at"
t.index ["name"], name: "index_configurations_on_name", unique: true
end
add_index "configurations", ["name"], name: "index_configurations_on_name", unique: true
create_table "evidence", force: :cascade do |t|
t.integer "node_id"
t.integer "issue_id"
t.text "content"
t.string "author"
t.datetime "created_at"
t.datetime "updated_at"
t.index ["issue_id"], name: "index_evidence_on_issue_id"
t.index ["node_id"], name: "index_evidence_on_node_id"
end
add_index "evidence", ["issue_id"], name: "index_evidence_on_issue_id"
add_index "evidence", ["node_id"], name: "index_evidence_on_node_id"
create_table "logs", force: :cascade do |t|
t.integer "uid"
t.text "text"
@@ -68,44 +64,47 @@
t.integer "position"
t.text "properties"
t.integer "children_count", default: 0, null: false
t.index ["parent_id"], name: "index_nodes_on_parent_id"
t.index ["type_id"], name: "index_nodes_on_type_id"
end
add_index "nodes", ["parent_id"], name: "index_nodes_on_parent_id"
add_index "nodes", ["type_id"], name: "index_nodes_on_type_id"
create_table "notes", force: :cascade do |t|
t.string "author"
t.text "text"
t.integer "node_id"
t.integer "category_id"
t.datetime "created_at"
t.datetime "updated_at"
t.index ["category_id"], name: "index_notes_on_category_id"
t.index ["node_id"], name: "index_notes_on_node_id"
end
add_index "notes", ["category_id"], name: "index_notes_on_category_id"
add_index "notes", ["node_id"], name: "index_notes_on_node_id"
create_table "taggings", force: :cascade do |t|
t.integer "tag_id"
t.integer "taggable_id"
t.string "taggable_type"
t.integer "taggable_id"
t.datetime "created_at"
t.datetime "updated_at"
t.index ["tag_id", "taggable_id", "taggable_type"], name: "index_taggings_on_tag_id_and_taggable_id_and_taggable_type", unique: true
t.index ["tag_id"], name: "index_taggings_on_tag_id"
t.index ["taggable_type", "taggable_id"], name: "index_taggings_on_taggable_type_and_taggable_id"
end
add_index "taggings", ["tag_id", "taggable_id", "taggable_type"], name: "index_taggings_on_tag_id_and_taggable_id_and_taggable_type", unique: true
add_index "taggings", ["tag_id"], name: "index_taggings_on_tag_id"
add_index "taggings", ["taggable_type", "taggable_id"], name: "index_taggings_on_taggable_type_and_taggable_id"
create_table "tags", force: :cascade do |t|
t.string "name", null: false
t.integer "taggings_count", default: 0, null: false
t.datetime "created_at"
t.datetime "updated_at"
t.index ["name"], name: "index_tags_on_name"
t.index ["taggings_count"], name: "index_tags_on_taggings_count"
end
add_index "tags", ["name"], name: "index_tags_on_name"
add_index "tags", ["taggings_count"], name: "index_tags_on_taggings_count"
create_table "users", force: :cascade do |t|
t.string "email"
t.string "password_hash"
t.datetime "created_at"
t.datetime "updated_at"
end
create_table "versions", force: :cascade do |t|
t.string "item_type", null: false
@@ -114,8 +113,7 @@
t.string "whodunnit"
t.text "object", limit: 1073741823
t.datetime "created_at"
t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
end
add_index "versions", ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
end
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe "API" do
describe "Exceptions" do
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe "Evidence API" do
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe "Issues API" do
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe "Nodes API" do
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe "Notes API" do
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe "Describe attachments" do
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
describe "evidence pages", js: true do
include ActivityMacros
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe "evidence" do
subject { page }
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe "Export Manager" do
before { login_to_project_as_user }
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
describe "issue pages" do
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
describe "issue table" do
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
describe "issue trash" do
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe "Issues pages" do
subject { page }
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe "Describe methodologies" do
it "should require authenticated users" do
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
describe "moving a node", js: true do
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
describe "node pages", js: true do
include ActivityMacros
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
describe "node pages" do
subject { page }
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
describe "moving a note", js: true do
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
describe "note pages", js: true do
include ActivityMacros
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
describe "note pages" do
subject { page }
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
describe "User navigates to entity page from search" do
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
describe "User searches", type: :feature do
def setup_test_data
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
describe SearchHelper do
def options(term:, scope:)
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
# This runs ActiveModel::Lint tests
# See:
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Activity do
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Attachment do
fixtures :configurations
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Configuration do
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Evidence do
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Issue do
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
# This runs ActiveModel::Lint tests
# See:
View
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Node do
let(:node) { build(:node) }
View
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Note do
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
# Remember NoteTemplate inherits from FileBackedModel which is ActiveModel
# compliant
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
describe RecoverableRevision do
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
describe Search do
View
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Tag do
describe '#display_name' do
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Tagging do
describe '#valid?' do
Oops, something went wrong.