Make all spec work, switch to thoughtbot way of integration testing

app/assets/images/logo.svg

@@ -126,13 +126,13 @@
    guidetolerance="10"
    inkscape:pageopacity="0"
    inkscape:pageshadow="2"
-   inkscape:window-width="1122"
-   inkscape:window-height="852"
+   inkscape:window-width="1435"
+   inkscape:window-height="860"
    id="namedview43"
    showgrid="false"
    inkscape:zoom="6.34"
-   inkscape:cx="51.171527"
-   inkscape:cy="47.772468"
+   inkscape:cx="35.062165"
+   inkscape:cy="30.642055"
    inkscape:window-x="0"
    inkscape:window-y="0"
    inkscape:window-maximized="0"
@@ -143,12 +143,12 @@
 
 
 <rect
-   style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+   style="fill:#5f3110;fill-opacity:1;stroke:none"
    id="rect3809"
    width="96.056786"
    height="32.492115"
-   x="2.5236592"
-   y="47.791798"
+   x="2.0504732"
+   y="47.003155"
    ry="0" /><text
    font-size="9.4245"
    id="text5"
@@ -164,6 +164,7 @@
 
 
 
+
 <text
    id="text7"
    x="12.23935"
@@ -181,6 +182,7 @@
 
 
 
+
 <text
    font-size="9.4245"
    id="text19"
@@ -196,6 +198,7 @@
 
 
 
+
 <g
    id="g3012"
    inkscape:export-filename="/Users/bterkuile/Qwaiter/Android app/Pictures/icon-high-res.png"
@@ -346,41 +349,39 @@
      transform="translate(-4208.3103,-4204.1921)"
      inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
      inkscape:export-xdpi="112.82128"
-     inkscape:export-ydpi="112.82128" /></g><text
-   inkscape:export-ydpi="413.97891"
-   inkscape:export-xdpi="413.97891"
-   inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-text.png"
-   y="68.982262"
-   x="21.494862"
-   style="font-size:17.67565727px;fill:#ffffff;fill-opacity:1;font-family:HelveticaRounded-Bold"
-   id="text3029"
-   font-size="9.4245"><tspan
-     id="tspan3031"
-     style="fill:#ffffff;fill-opacity:1;font-family:Arial Rounded MT Bold;-inkscape-font-specification:Arial Rounded MT Bold">Q</tspan></text>
+     inkscape:export-ydpi="112.82128" /></g>
 <text
    inkscape:export-ydpi="413.97891"
    inkscape:export-xdpi="413.97891"
    inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-text.png"
-   style="font-size:20.05559921px;line-height:139.99999762%;fill:#ffffff;fill-opacity:1"
-   y="69.955124"
-   x="35.827068"
+   style="font-size:20.05559921px;line-height:139.99999762%;fill:#7bb459;fill-opacity:1"
+   y="69.109116"
+   x="23.631485"
    id="text3033"
    sodipodi:linespacing="140%"><tspan
-     style="font-size:15.75116634px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:139.99999762%;letter-spacing:-0.68085659px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;font-family:Arial Rounded MT Bold;-inkscape-font-specification:'Arial Rounded MT Bold,'"
+     style="font-size:15.75116634px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:139.99999762%;letter-spacing:-0.68085659px;writing-mode:lr-tb;text-anchor:start;fill:#7bb459;fill-opacity:1;font-family:Arial Rounded MT Bold;-inkscape-font-specification:'Arial Rounded MT Bold,'"
      id="tspan3035"
      font-size="9.4245"
-     y="69.955124"
-     x="35.827068"
-     dx="0">WAITE</tspan></text>
+     y="69.109116"
+     x="23.631485"
+     dx="0 0"><tspan
+       style="fill:#f8ad15;fill-opacity:1"
+       id="tspan3824">Q</tspan><tspan
+       style="fill:#ffffff;fill-opacity:1"
+       id="tspan3800">WAITE</tspan><tspan
+       style="fill:#f8ad15;fill-opacity:1"
+       id="tspan3826">R</tspan></tspan></text>
+
+
 <text
-   inkscape:export-ydpi="413.97891"
-   inkscape:export-xdpi="413.97891"
-   inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-text.png"
-   y="69.934372"
-   x="83.856453"
-   style="font-size:17.45138359px;fill:#ffffff;fill-opacity:1;font-family:HelveticaRounded-Bold"
-   id="text3037"
-   font-size="9.4245"><tspan
-     id="tspan3039"
-     style="fill:#ffffff;fill-opacity:1;font-family:Arial Rounded MT Bold;-inkscape-font-specification:Arial Rounded MT Bold">R</tspan></text>
+   xml:space="preserve"
+   style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+   x="35.962147"
+   y="74.290222"
+   id="text3028"
+   sodipodi:linespacing="125%"><tspan
+     sodipodi:role="line"
+     id="tspan3030"
+     x="35.962147"
+     y="74.290222" /></text>
 </svg>