Merge pull request #6 from schmunk42/master

Get all changes

.gitlab-ci.yml

@@ -2,7 +2,6 @@ before_script:
   - export BUILD_PREFIX=buildref${CI_BUILD_REF}$(echo ${CI_BUILD_REF_NAME} | tr -dc '[:alnum:]\n\r' | tr '[:upper:]' '[:lower:]')giiant
   - export COMPOSE_PROJECT_NAME=${BUILD_PREFIX}
   - cd tests
-  - cp docker-compose.override-dist.yml docker-compose.override.yml
 
 stages:
   - test
@@ -18,7 +17,7 @@ test:
     - sleep 10
     - docker-compose run --rm phpfpm setup.sh
     - set +e
-    - docker-compose run --rm -e YII_ENV=test phpfpm codecept run --steps --html=_report.html -g mandatory -g ${GIIANT_TEST_DB} cli,unit,functional,acceptance; TESTS_EXIT_CODE=$?
+    - docker-compose run --rm -e YII_ENV=dev phpfpm bash -c 'codecept run --steps --html=_report.html -g mandatory -g ${GIIANT_TEST_DB} cli,unit,acceptance' || TESTS_EXIT_CODE=1
     - cp -r _output /tmp/${BUILD_PREFIX}
     - set -e
     - exit $TESTS_EXIT_CODE

CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+### 0.7.2
+
+  * fixed copy button
+
+### 0.7.0-0.7.1
+
+*see git log*
+
 ### 0.6.1 (2015-12-28)
 
   * improved test stack isolation

src/generators/crud/default/views/create.php

@@ -42,6 +42,8 @@
         </div>
     </div>
 
+    <hr />
+
     <?= '<?= ' ?>$this->render('_form', [
     'model' => $model,
     ]); ?>

src/generators/crud/default/views/index.php

@@ -172,6 +172,7 @@
         </div>
     </div>
 
+    <hr />
 
     <div class="table-responsive">
         <?= '<?= ' ?>GridView::widget([

src/generators/crud/default/views/update.php

@@ -43,6 +43,8 @@
         ) ?>, ['view', <?= $urlParams ?>], ['class' => 'btn btn-default']) ?>
     </div>
 
+    <hr />
+
     <?= '<?php ' ?>echo $this->render('_form', [
     'model' => $model,
     ]); ?>

src/generators/crud/default/views/view.php

@@ -37,7 +37,7 @@
 
 $this->title = $model->getAliasModel() . $model-><?= $generator->getNameAttribute() ?>;
 $this->params['breadcrumbs'][] = ['label' => $model->getAliasModel(true), 'url' => ['index']];
-$this->params['breadcrumbs'][] = ['label' => (string)$model-><?=$generator->getNameAttribute() ?>, 'url' => ['view', <?= $urlParams ?>]];
+$this->params['breadcrumbs'][] = ['label' => (string)$model-><?= $generator->getNameAttribute() ?>, 'url' => ['view', <?= $urlParams ?>]];
 $this->params['breadcrumbs'][] = <?= $generator->generateString('View') ?>;
 ?>
 <div class="giiant-crud <?= Inflector::camel2id(StringHelper::basename($generator->modelClass), '-', true) ?>-view">
@@ -61,25 +61,33 @@
 
 
     <div class="clearfix crud-navigation">
+
         <!-- menu buttons -->
         <div class='pull-left'>
-            <?= '<?= ' ?>Html::a('<span class="glyphicon glyphicon-pencil"></span> ' . <?= $generator->generateString(
-                'Edit'
-            ) ?>, ['update', <?= $urlParams ?>],['class' => 'btn btn-info']) ?>
-            <?= '<?= ' ?>Html::a('<span class="glyphicon glyphicon-copy"></span> ' . <?= $generator->generateString(
-                'Copy'
-            ) ?>, ['create', <?= $urlParams ?>, '<?= StringHelper::basename($generator->modelClass) ?>
-            '=>$copyParams],['class' => 'btn btn-success']) ?>
-            <?= '<?= ' ?>Html::a('<span class="glyphicon glyphicon-plus"></span> ' . <?= $generator->generateString(
-                'New'
-            ) ?>, ['create'], ['class' => 'btn btn-success']) ?>
+            <?= '<?= ' ?>Html::a(
+            '<span class="glyphicon glyphicon-pencil"></span> ' . <?= $generator->generateString('Edit') ?>,
+            [ 'update', <?= $urlParams ?>],
+            ['class' => 'btn btn-info']) ?>
+
+            <?= '<?= ' ?>Html::a(
+            '<span class="glyphicon glyphicon-copy"></span> ' . <?= $generator->generateString('Copy') ?>,
+            ['create', <?= $urlParams ?>, '<?= StringHelper::basename($generator->modelClass) ?>'=>$copyParams],
+            ['class' => 'btn btn-success']) ?>
+
+            <?= '<?= ' ?>Html::a(
+            '<span class="glyphicon glyphicon-plus"></span> ' . <?= $generator->generateString('New') ?>,
+            ['create'],
+            ['class' => 'btn btn-success']) ?>
         </div>
+
         <div class="pull-right">
-            <?= "<?= " ?>Html::a('<span class="glyphicon glyphicon-list"></span> ' . <?= $generator->generateString('Full list') ?>, ['index'], ['class'=>'btn btn-default']) ?>
+            <?= "<?= " ?>Html::a('<span class="glyphicon glyphicon-list"></span> '
+            . <?= $generator->generateString('Full list') ?>, ['index'], ['class'=>'btn btn-default']) ?>
         </div>
 
     </div>
 
+    <hr />
 
     <?php
     echo "<?php \$this->beginBlock('{$generator->modelClass}'); ?>\n";

tests/_config/acceptance.php

@@ -11,5 +11,11 @@
     [
         'controllerNamespace' => 'app\controllers',
         'language'            => 'en',
+        'modules' => [
+            'sakila' => [
+                'class'      => 'yii\sakila\Module',
+                'allowedIPs' => '*'
+            ]
+        ]
     ]
 );

tests/_config/config.php

@@ -10,6 +10,9 @@
         'gii' => [
             'class'      => 'yii\gii\Module',
             'allowedIPs' => '*'
+        ],
+        'sakila' => [
+            'class'      => 'app\modules\sakila\Module',
         ]
     ],
 ];

tests/_helpers/_generated/CliTesterActions.php

@@ -1,4 +1,4 @@
-<?php  //[STAMP] 33ba7c80e2577d6ac8ef41e7f7aaad5a
+<?php  //[STAMP] ebc9e817e95a85adbdeda62cb1003395
 namespace _generated;
 
 // This class was automatically generated by build task
@@ -7,7 +7,6 @@
 
 use Codeception\Module\Filesystem;
 use Codeception\Module\Cli;
-use Codeception\Module\CliHelper;
 
 trait CliTesterActions
 {
@@ -487,15 +486,4 @@ public function canSeeShellOutputMatches($regex) {
     public function seeShellOutputMatches($regex) {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeShellOutputMatches', func_get_args()));
     }
-
-
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     *
-     * @see \Codeception\Module\CliHelper::runShellCmd()
-     */
-    public function runShellCmd($command, $failNonZero = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('runShellCmd', func_get_args()));
-    }
 }